Merge pull request #834 from asoldano/build-cleanup

Build cleanup
resteasy · Jun 10, 2016 · 8bfc117 · 8bfc117
2 parents 345f129 + 24903aa
commit 8bfc117
Show file tree

Hide file tree

Showing 37 changed files with 120 additions and 349 deletions.
diff --git a/arquillian/RESTEASY-1223-WF8/pom.xml b/arquillian/RESTEASY-1223-WF8/pom.xml
@@ -177,7 +177,6 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>${dep.snakeyaml.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...SY-TEST-WF8/src/test/java/org/jboss/resteasy/test/resteasy1119/TestContextProviders2.java b/...SY-TEST-WF8/src/test/java/org/jboss/resteasy/test/resteasy1119/TestContextProviders2.java
@@ -54,6 +54,7 @@ <T> T get(String path, Class<T> clazz, Annotation[] annotations) throws Exceptio
       return entity;
    }
 
+   @SuppressWarnings("unchecked")
    @Override
    <S, T> T post(String path, S payload, MediaType mediaType,
          Class<T> returnType, Type genericReturnType, Annotation[] annotations) throws Exception

diff --git a/as7-integration-testing/cdi-test/pom.xml b/as7-integration-testing/cdi-test/pom.xml
@@ -23,8 +23,6 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>${dep.cdi-api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>

diff --git a/as8-integration-testing/application-test/pom.xml b/as8-integration-testing/application-test/pom.xml
@@ -21,8 +21,6 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>${dep.cdi-api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>

diff --git a/as8-integration-testing/cdilocator-test/pom.xml b/as8-integration-testing/cdilocator-test/pom.xml
@@ -17,8 +17,6 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>${dep.cdi-api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ejb</groupId>

diff --git a/as8-integration-testing/ejb-singleton-test/pom.xml b/as8-integration-testing/ejb-singleton-test/pom.xml
@@ -18,8 +18,6 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>${dep.cdi-api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ejb</groupId>

diff --git a/async-http-servlet-3.0/pom.xml b/async-http-servlet-3.0/pom.xml
@@ -32,20 +32,10 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
 
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -26,44 +26,43 @@
     <packaging>pom</packaging>
 
     <properties>
-        <jboss.home />
-        <dep.jaxb-impl.version>2.2.7</dep.jaxb-impl.version>
-        <dep.jettison.version>1.3.3</dep.jettison.version>
-        <dep.commons-io.version>2.4</dep.commons-io.version>
-        <dep.hibernate-validator.version>5.1.3.Final</dep.hibernate-validator.version>
-        <dep.javax.persistence.version>1.0.1.Final</dep.javax.persistence.version>
-        <dep.javax.activation.version>1.1.1</dep.javax.activation.version>
-        <dep.spring-webmvc.version>3.0.6.RELEASE</dep.spring-webmvc.version>
-        <dep.snakeyaml.version>1.17</dep.snakeyaml.version>
-        <dep.cdi-api.version>1.2</dep.cdi-api.version>
-        <dep.jboss-ejb-api_3.1_spec.version>1.0.0.Final</dep.jboss-ejb-api_3.1_spec.version>
-        <dep.guice.version>4.0</dep.guice.version>
-        <dep.netty.version>3.6.4.Final</dep.netty.version>
-        <dep.netty4.version>4.0.7.Final</dep.netty4.version>
-        <dep.slf4j.version>1.7.7</dep.slf4j.version>
-        <dep.bc.version>1.52</dep.bc.version>
-        <dep.com.sun.mail.version>1.5.5</dep.com.sun.mail.version>
         <dep.arquillian-bom.version>1.1.11.Final</dep.arquillian-bom.version>
         <dep.arquillian-wildfly.version>8.2.1.Final</dep.arquillian-wildfly.version>
+        <jboss.home />
+        <!-- java 7-->
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <version.com.fasterxml.jackson>2.7.3</version.com.fasterxml.jackson>
+        <version.com.google.inject.guice>4.0</version.com.google.inject.guice>
+        <version.com.sun.mail>1.5.5</version.com.sun.mail>
+        <version.com.sun.xml.bind.jaxb-impl>2.2.7</version.com.sun.xml.bind.jaxb-impl>
+        <version.commons-io.commons-io>2.4</version.commons-io.commons-io>
+        <version.io.netty.netty>3.6.4.Final</version.io.netty.netty>
+        <version.io.netty.netty4>4.0.7.Final</version.io.netty.netty4>
+        <version.io.undertow>1.3.22.Final</version.io.undertow>
+        <version.javax.activation>1.1.1</version.javax.activation>
+        <version.javax.enterprise.cdi-api>1.2</version.javax.enterprise.cdi-api>
+        <version.javax.persistence>1.0.1.Final</version.javax.persistence>
+        <version.org.apache.httpcomponents.httpclient>4.5</version.org.apache.httpcomponents.httpclient>
+        <version.org.bouncycastle>1.52</version.org.bouncycastle>
+        <version.org.codehaus.jackson>1.9.13</version.org.codehaus.jackson>
+        <version.org.codehaus.jettison>1.3.3</version.org.codehaus.jettison>
+        <version.org.eclipse.jetty>9.2.13.v20150730</version.org.eclipse.jetty>
+        <version.org.glassfish.javax.el>3.0.1-b08</version.org.glassfish.javax.el>
+        <version.org.hibernate.hibernate-validator>5.1.3.Final</version.org.hibernate.hibernate-validator>
+        <version.org.infinispan>5.1.6.FINAL</version.org.infinispan>
+        <version.org.javassist>3.20.0-GA</version.org.javassist>
         <version.org.jboss.logging.jboss-logging>3.3.0.Final</version.org.jboss.logging.jboss-logging>
+        <version.org.jboss.logging.jboss-logging-annotations>1.2.0.Final</version.org.jboss.logging.jboss-logging-annotations>
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.0.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
-        <version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.0.Final</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
         <version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>1.0.5.Final</version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>
+        <version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.1_spec>1.0.0.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.1_spec>
         <version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>
         <version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>1.0.0.Final</version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>
-        <version.org.javassist>3.20.0-GA</version.org.javassist>
-        <version.org.glassfish.javax.el>3.0.1-b08</version.org.glassfish.javax.el>
-        <version.io.undertow>1.3.22.Final</version.io.undertow>
-        <version.com.fasterxml.jackson>2.7.3</version.com.fasterxml.jackson>
-        <version.org.apache.httpcomponents.httpclient>4.5</version.org.apache.httpcomponents.httpclient>
-        <version.org.apache.httpcomponents.httpcore>4.4.1</version.org.apache.httpcomponents.httpcore>
-        <version.org.eclipse.jetty>9.2.13.v20150730</version.org.eclipse.jetty>
-        <version.org.codehaus.jackson>1.9.13</version.org.codehaus.jackson>
-        <version.org.infinispan>5.1.6.FINAL</version.org.infinispan>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- java 7-->
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
+        <version.org.slf4j>1.7.7</version.org.slf4j>
+        <version.org.springframework.spring-webmvc>3.0.6.RELEASE</version.org.springframework.spring-webmvc>
+        <version.org.yaml.snakeyaml>1.17</version.org.yaml.snakeyaml>
     </properties>
 
     <url>http://rest-easy.org</url>
@@ -238,32 +237,54 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>${dep.slf4j.version}</version>
+                <version>${version.org.slf4j}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>${dep.slf4j.version}</version>
+                <version>${version.org.slf4j}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>${dep.slf4j.version}</version>
+                <version>${version.org.slf4j}</version>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.17</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>${version.org.hibernate.hibernate-validator}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>
                 <version>${version.org.jboss.logging.jboss-logging}</version>
                 <!--<scope>provided</scope> todo this should be provided-->
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging-annotations</artifactId>
+                <version>${version.org.jboss.logging.jboss-logging-annotations}</version>
+                <scope>provided</scope>
+                <optional>true</optional>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging-processor</artifactId>
+                <version>${version.org.jboss.logging.jboss-logging-annotations}</version>
+                <scope>provided</scope>
+                <optional>true</optional>
+            </dependency>
+
             <dependency>
                 <groupId>org.javassist</groupId>
                 <artifactId>javassist</artifactId>
@@ -283,15 +304,22 @@
                 <version>${version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.spec.javax.ejb</groupId>
+                <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+                <scope>provided</scope>
+                <version>${version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.1_spec}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>${dep.jaxb-impl.version}</version>
+                <version>${version.com.sun.xml.bind.jaxb-impl}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.mail</groupId>
                 <artifactId>javax.mail</artifactId>
-                <version>${dep.com.sun.mail.version}</version>
+                <version>${version.com.sun.mail}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.stream</groupId>
@@ -313,10 +341,16 @@
                 <version>1.2.13</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-io</groupId>
+	            <artifactId>commons-io</artifactId>
+                <version>${version.commons-io.commons-io}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.hibernate.javax.persistence</groupId>
                 <artifactId>hibernate-jpa-2.0-api</artifactId>
-                <version>${dep.javax.persistence.version}</version>
+                <version>${version.javax.persistence}</version>
             </dependency>
 
 
@@ -333,7 +367,7 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>${dep.jettison.version}</version>
+                <version>${version.org.codehaus.jettison}</version>
                 <exclusions>
                     <!-- This results in duplicate stax-api jars. This is the older
             one. A newer is brought in by com.sun.xml.bind:jaxb-impl -->
@@ -347,9 +381,19 @@
             <dependency>
                 <groupId>javax.activation</groupId>
                 <artifactId>activation</artifactId>
-                <version>${dep.javax.activation.version}</version>
+                <version>${version.javax.activation}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+                <version>${version.io.netty.netty}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${version.io.netty.netty4}</version>
+            </dependency>
             <!--
             We forked it for now because of startup/shutdown race conditions
 
@@ -374,6 +418,12 @@
                 <artifactId>jyaml</artifactId>
                 <version>1.3</version>
             </dependency>
+            <dependency>
+                <groupId>javax.enterprise</groupId>
+                <artifactId>cdi-api</artifactId>
+                <version>${version.javax.enterprise.cdi-api}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>javax.json</groupId>
                 <artifactId>javax.json-api</artifactId>
@@ -401,6 +451,11 @@
                 <version>4.12</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>${version.com.google.inject.guice}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
@@ -470,17 +525,27 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>${dep.bc.version}</version>
+                <version>${version.org.bouncycastle}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcmail-jdk15on</artifactId>
-                <version>${dep.bc.version}</version>
+                <version>${version.org.bouncycastle}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${dep.bc.version}</version>
+                <version>${version.org.bouncycastle}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webmvc</artifactId>
+                <version>${version.org.springframework.spring-webmvc}</version>
+            </dependency>
+            <dependency>
+	            <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${version.org.yaml.snakeyaml}</version>
             </dependency>
             <dependency>
                 <groupId>net.oauth.core</groupId>

diff --git a/providers/fastinfoset/pom.xml b/providers/fastinfoset/pom.xml
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${dep.spring-webmvc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -58,20 +57,10 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency> 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>

diff --git a/providers/jaxb/pom.xml b/providers/jaxb/pom.xml
@@ -52,20 +52,10 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
-            <version>1.2.0.Final</version>
-            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
-                  projects that depend on this project.-->
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency> 
     </dependencies>