Skip to content

Commit

Permalink
Merge pull request #225 from dadoonet/pr/update-guava
Browse files Browse the repository at this point in the history 
Refactor maven project
  • Loading branch information
@fcamblor
fcamblor committed Nov 15, 2015
2 parents d7dd080 + 8cbcaaf commit 0b1123e
Show file tree
Hide file tree
Showing 43 changed files with 458 additions and 681 deletions.
440 changes: 440 additions & 0 deletions pom.xml
View file

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions restx-admin/pom.xml
View file
Expand Up @@ -10,43 +10,29 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-admin</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-admin</name>

<properties>
<restx.version>0.35-SNAPSHOT</restx.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

<dependencies>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-factory</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-core</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-security-basic</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-core-annotation-processor</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-webjars</artifactId>
<version>${restx.version}</version>
</dependency>
</dependencies>
</project>
6 changes: 1 addition & 5 deletions restx-annotation-processors-package/pom.xml
View file
Expand Up @@ -8,10 +8,8 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-annotation-processors-package</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-annotation-processors-package</name>
<description>
This RESTX module is used to provide a packaged version of all the official RESTX annotation processors.

Expand Down Expand Up @@ -58,12 +56,10 @@
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-factory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-core-annotation-processor</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
17 changes: 0 additions & 17 deletions restx-apidocs-doclet/pom.xml
View file
Expand Up @@ -10,20 +10,10 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-apidocs-doclet</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-apidocs-doclet</name>

<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<guava.version>17.0</guava.version>
<joda-time.version>2.3</joda-time.version>
<jackson.version>2.3.3</jackson.version>
<junit.version>4.11</junit.version>
<assertj-core.version>1.6.0</assertj-core.version>
</properties>

<dependencies>
Expand All @@ -37,38 +27,31 @@
<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-annotations</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.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
16 changes: 0 additions & 16 deletions restx-apidocs/pom.xml
View file
Expand Up @@ -10,49 +10,33 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-apidocs</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-apidocs</name>

<properties>
<restx.version>0.35-SNAPSHOT</restx.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<jackson.version>2.3.3</jackson.version>
</properties>

<dependencies>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-factory</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-core</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-core-annotation-processor</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-admin</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jsonSchema</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-webjars</artifactId>
<version>${restx.version}</version>
</dependency>
</dependencies>
</project>
13 changes: 0 additions & 13 deletions restx-barbarywatch/pom.xml
View file
Expand Up @@ -10,34 +10,21 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-barbarywatch</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-barbarywatch</name>

<properties>
<restx.version>0.35-SNAPSHOT</restx.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<junit.version>4.11</junit.version>
</properties>

<dependencies>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-common</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>3.2.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 0 additions & 12 deletions restx-build-shell/pom.xml
View file
Expand Up @@ -10,33 +10,21 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-build-shell</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-build-shell</name>

<properties>
<restx.version>0.35-SNAPSHOT</restx.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

<dependencies>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-factory</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-shell</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-build</artifactId>
<version>${restx.version}</version>
</dependency>
</dependencies>
</project>
9 changes: 0 additions & 9 deletions restx-build/pom.xml
View file
Expand Up @@ -10,31 +10,22 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-build</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-build</name>

<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<junit.version>4.11</junit.version>
<assertj-core.version>1.6.0</assertj-core.version>
<project.main.classname>restx.build.RestxBuild</project.main.classname>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
19 changes: 0 additions & 19 deletions restx-classloader/pom.xml
View file
Expand Up @@ -10,22 +10,10 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-classloader</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-classloader</name>

<properties>
<restx.version>0.35-SNAPSHOT</restx.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<slf4j-api.version>1.7.5</slf4j-api.version>
<guava.version>17.0</guava.version>
<joda-time.version>2.3</joda-time.version>
<javax.inject.version>1</javax.inject.version>
<junit.version>4.11</junit.version>
<assertj-core.version>1.6.0</assertj-core.version>
<project.premain.classname>restx.classloader.HotswapAgent</project.premain.classname>
<project.agent.can-redefine-classes>true</project.agent.can-redefine-classes>
<project.agent.can-retransform-classes>false</project.agent.can-retransform-classes>
Expand All @@ -36,38 +24,31 @@
<dependency>
<groupId>io.restx</groupId>
<artifactId>restx-common</artifactId>
<version>${restx.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
20 changes: 0 additions & 20 deletions restx-common/pom.xml
View file
Expand Up @@ -10,54 +10,34 @@
<version>0.35-SNAPSHOT</version>
</parent>

<groupId>io.restx</groupId>
<artifactId>restx-common</artifactId>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>restx-common</name>

<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<guava.version>17.0</guava.version>
<joda-time.version>2.3</joda-time.version>
<mustache.version>1.8</mustache.version>
<reflections.version>0.9.9-RC1</reflections.version>
<junit.version>4.11</junit.version>
<assertj-core.version>1.6.0</assertj-core.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>
<version>${mustache.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 0b1123e

Please sign in to comment.