From 1e83f3c0359fe7c7acd8a6edfcc4cdd2aa1f532a Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Fri, 20 Sep 2013 11:19:17 +0200
Subject: [PATCH] Parametrized version number and bumped 0.3-SNAPSHOT

---
 benchmarking/pom.xml   |  37 +------
 broker/pom.xml         |  33 +------
 netty_parser/pom.xml   | 215 ++++++++++++++++-------------------------
 parser/pom.xml         |  52 +---------
 parser_commons/pom.xml | 157 ++++++++++++++----------------
 pom.xml                |   4 +-
 6 files changed, 165 insertions(+), 333 deletions(-)

diff --git a/benchmarking/pom.xml b/benchmarking/pom.xml
index 3fd21502..054bf747 100644
--- a/benchmarking/pom.xml
+++ b/benchmarking/pom.xml
@@ -6,7 +6,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.2</version>
+        <version>${moquette-version}</version>
     </parent>
 
     <artifactId>moquette-benchmark</artifactId>
@@ -19,19 +19,6 @@
     </properties>
 
     <dependencies>
-<!--        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <version>${mina-version}</version>
-        </dependency>-->
-        
-        <!--        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.4</version>
-        </dependency>-->
-        
-        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -49,21 +36,6 @@
             <artifactId>mqtt-client</artifactId>
             <version>1.3</version>
         </dependency>
-                
-<!--        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        
-         needs extra dependencies: objenesis & hamcrest 
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>  
-            <version>1.9.0</version> 
-            <scope>test</scope>
-        </dependency>-->
     </dependencies>
     
     <build>
@@ -93,11 +65,4 @@
             
         </plugins>
     </build>
-    
-<!--    <repositories>
-        <repository>
-            <id>Fusesource Releases</id>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-        </repository>
-    </repositories>-->
 </project>
diff --git a/broker/pom.xml b/broker/pom.xml
index f4e48972..def9cbfd 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -6,12 +6,12 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.2</version>
+        <version>${moquette-version}</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
     <packaging>jar</packaging>
-    <version>0.2</version>
+    <version>${moquette-version}</version>
     <name>Moquette - broker</name>
 
     <properties>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-mina-parser</artifactId>
-            <version>0.2</version>
+            <version>${moquette-version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-netty-parser</artifactId>
-            <version>0.2</version>
+            <version>${moquette-version}</version>
         </dependency>
 
         <dependency>
@@ -43,13 +43,6 @@
             <version>2.7.1</version>
         </dependency>
         
-        <!--        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.4</version>
-        </dependency>-->
-        
-        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -82,9 +75,6 @@
             <artifactId>mqtt-client</artifactId>
             <version>0.4.0</version>
         </dependency>
-
-
-
     </dependencies>
     
     <build>
@@ -129,21 +119,6 @@
     </build>
     
     <repositories>
-<!--        <repository>
-            <id>Fusesource Releases</id>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-        </repository>-->
-<!--        <repository>
-            <id>fusesource.snapshots</id>
-            <name>FuseSource Snapshot Repository</name>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>-->
         <repository>
             <id>Paho Releases</id>
             <url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index a33bafe4..5631fdf0 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -1,131 +1,84 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <relativePath>../pom.xml</relativePath>
-        <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
-        <version>0.2</version>
-    </parent>
-
-    <artifactId>moquette-netty-parser</artifactId>
-    <packaging>jar</packaging>
-    <version>0.2</version>
-    <name>Moquette - Netty Parser</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.dna.mqtt</groupId>
-            <artifactId>moquette-parser-commons</artifactId>
-            <version>0.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.0.8.Final</version>
-        </dependency>
-            
-        
-        <!--dependency>
-            <groupId>com.googlecode.disruptor</groupId>
-            <artifactId>disruptor</artifactId>
-            <version>2.7.1</version>
-        </dependency -->
-        
-        <!--        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.4</version>
-        </dependency>-->
-        
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-        
-        <!--dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
-        </dependency-->
-                
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- needs extra dependencies: objenesis & hamcrest -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>  
-            <version>1.9.0</version> 
-            <scope>test</scope>
-        </dependency>
-
-        <!--dependency>
-            <groupId>org.fusesource.mqtt-client</groupId>
-            <artifactId>mqtt-client</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.fusesource.hawtbuf</groupId>
-            <artifactId>hawtbuf</artifactId>
-            <version>1.9</version>
-        </dependency-->
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-    
-    <repositories>
-<!--        <repository>
-            <id>Fusesource Releases</id>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-        </repository>-->
-<!--        <repository>
-            <id>fusesource.snapshots</id>
-            <name>FuseSource Snapshot Repository</name>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>-->
-    </repositories>
-</project>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <relativePath>../pom.xml</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>org.dna.mqtt</groupId>
+        <version>${moquette-version}</version>
+    </parent>
+
+    <artifactId>moquette-netty-parser</artifactId>
+    <packaging>jar</packaging>
+    <version>${moquette-version}</version>
+    <name>Moquette - Netty Parser</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dna.mqtt</groupId>
+            <artifactId>moquette-parser-commons</artifactId>
+            <version>0.2</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.8.Final</version>
+        </dependency>
+            
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- needs extra dependencies: objenesis & hamcrest -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>  
+            <version>1.9.0</version> 
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+    
+    <repositories>
+    </repositories>
+</project>
diff --git a/parser/pom.xml b/parser/pom.xml
index 36c14c6b..436e819b 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -6,12 +6,12 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.2</version>
+        <version>${moquette-version}</version>
     </parent>
 
     <artifactId>moquette-mina-parser</artifactId>
     <packaging>jar</packaging>
-    <version>0.2</version>
+    <version>${moquette-version}</version>
     <name>Moquette - MINA Parser</name>
 
     <properties>
@@ -28,34 +28,15 @@
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-parser-commons</artifactId>
-            <version>0.2</version>
+            <version>${moquette-version}</version>
         </dependency>
         
-        <!--dependency>
-            <groupId>com.googlecode.disruptor</groupId>
-            <artifactId>disruptor</artifactId>
-            <version>2.7.1</version>
-        </dependency -->
-        
-        <!--        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.4</version>
-        </dependency>-->
-        
-        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.6.4</version>
         </dependency>
         
-        <!--dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
-        </dependency-->
-                
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -71,18 +52,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--dependency>
-            <groupId>org.fusesource.mqtt-client</groupId>
-            <artifactId>mqtt-client</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.fusesource.hawtbuf</groupId>
-            <artifactId>hawtbuf</artifactId>
-            <version>1.9</version>
-        </dependency-->
     </dependencies>
     
     <build>
@@ -111,20 +80,5 @@
     </build>
     
     <repositories>
-<!--        <repository>
-            <id>Fusesource Releases</id>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-        </repository>-->
-<!--        <repository>
-            <id>fusesource.snapshots</id>
-            <name>FuseSource Snapshot Repository</name>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>-->
     </repositories>
 </project>
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
index 7bcfdf9a..587a1bce 100644
--- a/parser_commons/pom.xml
+++ b/parser_commons/pom.xml
@@ -1,86 +1,71 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <relativePath>../pom.xml</relativePath>
-        <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
-        <version>0.2</version>
-    </parent>
-
-    <artifactId>moquette-parser-commons</artifactId>
-    <packaging>jar</packaging>
-    <version>0.2</version>
-    <name>Moquette - Parser Commons</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- needs extra dependencies: objenesis & hamcrest -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>  
-            <version>1.9.0</version> 
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-    
-    <repositories>
-<!--        <repository>
-            <id>Fusesource Releases</id>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-        </repository>-->
-<!--        <repository>
-            <id>fusesource.snapshots</id>
-            <name>FuseSource Snapshot Repository</name>
-            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>-->
-    </repositories>
-</project>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <relativePath>../pom.xml</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>org.dna.mqtt</groupId>
+        <version>${moquette-version}</version>
+    </parent>
+
+    <artifactId>moquette-parser-commons</artifactId>
+    <packaging>jar</packaging>
+    <version>${moquette-version}</version>
+    <name>Moquette - Parser Commons</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- needs extra dependencies: objenesis & hamcrest -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>  
+            <version>1.9.0</version> 
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+    
+    <repositories>
+    </repositories>
+</project>
diff --git a/pom.xml b/pom.xml
index 9c16b3db..e7da90a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <moquette.version>0.2</moquette.version>
+        <moquette-version>0.3-SNAPSHOT</moquette-version>
         <mina-version>2.0.7</mina-version>
     </properties>
     
@@ -11,7 +11,7 @@
     <artifactId>moquette-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.2</version>
+    <version>${moquette-version}</version>
     <name>Moquette MQTT library</name>
     <url>http://code.google.com/p/moquette-mqtt/</url>