anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parametrized version number and bumped 0.3-SNAPSHOT

Browse Source
This commit is contained in:
selva.andre
2013-09-20 11:19:17 +02:00
parent 4e27ee638a
commit 1e83f3c035
6 changed files with 165 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
benchmarking/pom.xml
+1 -36
View File
@@ -6,7 +6,7 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<version>0.2</version> <version>${moquette-version}</version>
</parent> </parent>
<artifactId>moquette-benchmark</artifactId> <artifactId>moquette-benchmark</artifactId>
@@ -19,19 +19,6 @@
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
@@ -49,21 +36,6 @@
<artifactId>mqtt-client</artifactId> <artifactId>mqtt-client</artifactId>
<version>1.3</version> <version>1.3</version>
</dependency> </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> </dependencies>
<build> <build>
@@ -93,11 +65,4 @@
</plugins> </plugins>
</build> </build>
<!-- <repositories>
<repository>
<id>Fusesource Releases</id>
<url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
</repository>
</repositories>-->
</project> </project>
broker/pom.xml
+4 -29
View File
@@ -6,12 +6,12 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<version>0.2</version> <version>${moquette-version}</version>
</parent> </parent>
<artifactId>moquette-broker</artifactId> <artifactId>moquette-broker</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.2</version> <version>${moquette-version}</version>
<name>Moquette - broker</name> <name>Moquette - broker</name>
<properties> <properties>
@@ -22,13 +22,13 @@
<dependency> <dependency>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<artifactId>moquette-mina-parser</artifactId> <artifactId>moquette-mina-parser</artifactId>
<version>0.2</version> <version>${moquette-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<artifactId>moquette-netty-parser</artifactId> <artifactId>moquette-netty-parser</artifactId>
<version>0.2</version> <version>${moquette-version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -43,13 +43,6 @@
<version>2.7.1</version> <version>2.7.1</version>
</dependency> </dependency>
<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.6.4</version>
</dependency>-->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
@@ -82,9 +75,6 @@
<artifactId>mqtt-client</artifactId> <artifactId>mqtt-client</artifactId>
<version>0.4.0</version> <version>0.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@@ -129,21 +119,6 @@
</build> </build>
<repositories> <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> <repository>
<id>Paho Releases</id> <id>Paho Releases</id>
<url>https://repo.eclipse.org/content/repositories/paho-releases/</url> <url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
netty_parser/pom.xml
+84 -131
View File
@@ -1,131 +1,84 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<version>0.2</version> <version>${moquette-version}</version>
</parent> </parent>
<artifactId>moquette-netty-parser</artifactId> <artifactId>moquette-netty-parser</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.2</version> <version>${moquette-version}</version>
<name>Moquette - Netty Parser</name> <name>Moquette - Netty Parser</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<artifactId>moquette-parser-commons</artifactId> <artifactId>moquette-parser-commons</artifactId>
<version>0.2</version> <version>0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>4.0.8.Final</version> <version>4.0.8.Final</version>
</dependency> </dependency>
<dependency>
<!--dependency> <groupId>org.slf4j</groupId>
<groupId>com.googlecode.disruptor</groupId> <artifactId>slf4j-log4j12</artifactId>
<artifactId>disruptor</artifactId> <version>1.6.4</version>
<version>2.7.1</version> </dependency>
</dependency -->
<dependency>
<!-- <dependency> <groupId>junit</groupId>
<groupId>org.slf4j</groupId> <artifactId>junit</artifactId>
<artifactId>slf4j-jdk14</artifactId> <version>4.8.2</version>
<version>1.6.4</version> <scope>test</scope>
</dependency>--> </dependency>
<!-- needs extra dependencies: objenesis & hamcrest -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.mockito</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>mockito-core</artifactId>
<version>1.6.4</version> <version>1.9.0</version>
</dependency> <scope>test</scope>
</dependency>
<!--dependency>
<groupId>org.fusesource.hawtdb</groupId> </dependencies>
<artifactId>hawtdb</artifactId>
<version>1.6</version> <build>
</dependency--> <plugins>
<plugin>
<dependency> <groupId>org.apache.maven.plugins</groupId>
<groupId>junit</groupId> <artifactId>maven-compiler-plugin</artifactId>
<artifactId>junit</artifactId> <configuration>
<version>4.8.2</version> <source>1.5</source>
<scope>test</scope> <target>1.5</target>
</dependency> </configuration>
</plugin>
<!-- needs extra dependencies: objenesis & hamcrest -->
<dependency> <plugin>
<groupId>org.mockito</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>mockito-core</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>1.9.0</version> <configuration>
<scope>test</scope> <excludes>
</dependency> <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
<exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
<!--dependency> </excludes>
<groupId>org.fusesource.mqtt-client</groupId> </configuration>
<artifactId>mqtt-client</artifactId> </plugin>
<version>1.3</version>
<scope>test</scope> </plugins>
</dependency> </build>
<dependency> <repositories>
<groupId>org.fusesource.hawtbuf</groupId> </repositories>
<artifactId>hawtbuf</artifactId> </project>
<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>
parser/pom.xml
+3 -49
View File
@@ -6,12 +6,12 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<version>0.2</version> <version>${moquette-version}</version>
</parent> </parent>
<artifactId>moquette-mina-parser</artifactId> <artifactId>moquette-mina-parser</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.2</version> <version>${moquette-version}</version>
<name>Moquette - MINA Parser</name> <name>Moquette - MINA Parser</name>
<properties> <properties>
@@ -28,34 +28,15 @@
<dependency> <dependency>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<artifactId>moquette-parser-commons</artifactId> <artifactId>moquette-parser-commons</artifactId>
<version>0.2</version> <version>${moquette-version}</version>
</dependency> </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> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version> <version>1.6.4</version>
</dependency> </dependency>
<!--dependency>
<groupId>org.fusesource.hawtdb</groupId>
<artifactId>hawtdb</artifactId>
<version>1.6</version>
</dependency-->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@@ -71,18 +52,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </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> </dependencies>
<build> <build>
@@ -111,20 +80,5 @@
</build> </build>
<repositories> <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> </repositories>
</project> </project>
parser_commons/pom.xml
+71 -86
View File
@@ -1,86 +1,71 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId> <groupId>org.dna.mqtt</groupId>
<version>0.2</version> <version>${moquette-version}</version>
</parent> </parent>
<artifactId>moquette-parser-commons</artifactId> <artifactId>moquette-parser-commons</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.2</version> <version>${moquette-version}</version>
<name>Moquette - Parser Commons</name> <name>Moquette - Parser Commons</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version> <version>1.6.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.8.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- needs extra dependencies: objenesis & hamcrest --> <!-- needs extra dependencies: objenesis & hamcrest -->
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>1.9.0</version> <version>1.9.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes>
<exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude> <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
<exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude> <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<!-- <repository> </repositories>
<id>Fusesource Releases</id> </project>
<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>
pom.xml
+2 -2
View File
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<moquette.version>0.2</moquette.version> <moquette-version>0.3-SNAPSHOT</moquette-version>
<mina-version>2.0.7</mina-version> <mina-version>2.0.7</mina-version>
</properties> </properties>
@@ -11,7 +11,7 @@
<artifactId>moquette-parent</artifactId> <artifactId>moquette-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.2</version> <version>${moquette-version}</version>
<name>Moquette MQTT library</name> <name>Moquette MQTT library</name>
<url>http://code.google.com/p/moquette-mqtt/</url> <url>http://code.google.com/p/moquette-mqtt/</url>