Skip to content

Commit

Permalink
Put hazelcast cluster manager in different module and simplified pom.…
Browse files Browse the repository at this point in the history 
…xml structure
  • Loading branch information
@purplefox
purplefox committed Nov 15, 2014
1 parent 82e1e13 commit e0c7e3c
Show file tree
Hide file tree
Showing 407 changed files with 186 additions and 1,951 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ test-tmp
*.class
ScratchPad.java
*.swp
.vertx
329 changes: 134 additions & 195 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
</parent>

<groupId>io.vertx</groupId>
<artifactId>vertx-parent</artifactId>
<artifactId>vertx-core</artifactId>
<version>3.0.0-SNAPSHOT</version>

<name>Vert.x - Parent Project</name>

<packaging>pom</packaging>
<name>Vert.x Core</name>

<licenses>
<license>
Expand All @@ -48,34 +46,6 @@
</license>
</licenses>

<!-- Temporary for using surefire 2.18-SNAPSHOT -->
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http:https://repo1.maven.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
</pluginRepository>
<pluginRepository>
<id>apache-snapshots</id>
<name>Apache Plugin Repository</name>
<url>http:https://repository.apache.org/snapshots/</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<updatePolicy>daily</updatePolicy>
</releases>
</pluginRepository>
</pluginRepositories>

<scm>
<connection>scm:git:[email protected]:eclipse/vert.x.git</connection>
<developerConnection>scm:git:[email protected]:eclipse/vert.x.git</developerConnection>
Expand All @@ -90,7 +60,6 @@

<netty.version>4.0.24.Final</netty.version>
<jackson.version>2.4.3</jackson.version>
<hazelcast.version>3.3.1</hazelcast.version>
<metrics.version>3.0.2</metrics.version>
<log4j.version>1.2.17</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
Expand All @@ -106,148 +75,81 @@
<maven.surefire.report.plugin.version>2.18</maven.surefire.report.plugin.version>
</properties>

<modules>
<module>vertx-core</module>
<module>vertx-hazelcast</module>
</modules>

<dependencyManagement>
<dependencies>
<!-- Vert.x projects -->
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-hazelcast</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 3rd party -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
<version>${apacheds-protocol-dns.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>codegen</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>codegen</artifactId>
<version>1.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
<version>${apacheds-protocol-dns.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.source.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<doclet>org.asciidoctor.Asciidoclet</doclet>
<docletArtifact>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoclet</artifactId>
<version>${asciidoclet.version}</version>
</docletArtifact>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
<excludes>
<exclude>**/Hazelcast*.java</exclude>
<exclude>**/RedeploySourceVerticle.java</exclude>
</excludes>
<systemPropertyVariables>
<io.netty.leakDetectionLevel>PARANOID</io.netty.leakDetectionLevel>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
<!-- Needs to be small enough to run in a EC2 1.7GB small instance -->
<argLine>-Xmx1200M</argLine>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${maven.surefire.report.plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<optimize>true</optimize>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<annotationProcessors>
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
</annotationProcessors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -258,7 +160,77 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<doclet>org.asciidoctor.Asciidoclet</doclet>
<docletArtifact>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoclet</artifactId>
<version>${asciidoclet.version}</version>
</docletArtifact>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
<excludes>
<exclude>**/RedeploySourceVerticle.java</exclude>
</excludes>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
</additionalClasspathElements>
<systemPropertyVariables>
<io.netty.leakDetectionLevel>PARANOID</io.netty.leakDetectionLevel>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
<!-- Needs to be small enough to run in a EC2 1.7GB small instance -->
<argLine>-Xmx1200M</argLine>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${maven.surefire.report.plugin.version}</version>
</plugin>
</plugins>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/vertx-version.txt</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/vertx-version.txt</exclude>
</excludes>
</resource>
</resources>
</build>

<profiles>
Expand All @@ -282,39 +254,6 @@
</build>
</profile>

<profile>
<id>HazelcastTests</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- We need to add a dummy exclude to override the inherited excludes from the parent pom.xml-->
<exclude>wibblefoobar</exclude>
</excludes>
<includes>
<include>**/Hazelcast*.java</include>
</includes>
</configuration>
<executions>
<execution>
<id>execution2</id>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
0 .../java/io/vertx/core/AbstractVerticle.java → .../java/io/vertx/core/AbstractVerticle.java
View file
File renamed without changes.
0 .../main/java/io/vertx/core/AsyncResult.java → src/main/java/io/vertx/core/AsyncResult.java
View file
File renamed without changes.
0 ...ava/io/vertx/core/AsyncResultHandler.java → ...ava/io/vertx/core/AsyncResultHandler.java
View file
File renamed without changes.
0 .../src/main/java/io/vertx/core/Context.java → src/main/java/io/vertx/core/Context.java
View file
File renamed without changes.
0 ...java/io/vertx/core/DeploymentOptions.java → ...java/io/vertx/core/DeploymentOptions.java
View file
File renamed without changes.
0 ...e/src/main/java/io/vertx/core/Future.java → src/main/java/io/vertx/core/Future.java
View file
File renamed without changes.
0 .../src/main/java/io/vertx/core/Handler.java → src/main/java/io/vertx/core/Handler.java
View file
File renamed without changes.
Loading

0 comments on commit e0c7e3c

Please sign in to comment.