[THORN-2207] finish updating dependencies to align with WildFly 14.0.1

thorntail · Dec 6, 2018 · 2404fac · 2404fac
1 parent 940ccd4
commit 2404fac
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 44 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -39,7 +39,7 @@
     <version.jboss-modules>1.8.6.Final</version.jboss-modules>
     <version.wildfly>14.0.1.Final</version.wildfly>
     <version.org.wildfly.core>6.0.2.Final</version.org.wildfly.core>
-    <version.jboss-logmanager-ext>1.0.0.Alpha3</version.jboss-logmanager-ext>
+    <version.jboss-logmanager-ext>1.0.0.Alpha5</version.jboss-logmanager-ext>
     <!-- Weld SE version must be aligned with the version used in WildFly -->
     <version.weld-se>3.0.5.Final</version.weld-se>
     <version.jandex>2.0.5.Final</version.jandex>
@@ -48,7 +48,7 @@
     <version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
     <version.com.fasterxml.jackson>2.9.5</version.com.fasterxml.jackson>
 
-    <version.org.objectweb.asm>6.0</version.org.objectweb.asm>
+    <version.org.ow2.asm>6.2.1</version.org.ow2.asm>
 
     <version.jolokia>1.3.4</version.jolokia>
     <version.io.swagger>1.5.21</version.io.swagger>
@@ -57,16 +57,19 @@
     <version.swagger.slf4j>1.6.3</version.swagger.slf4j>
     <version.swagger.commons.lang>3.2.1</version.swagger.commons.lang>
 
-    <version.hibernate-spatial>5.0.10.Final</version.hibernate-spatial>
-    <version.geolatte>1.0.1</version.geolatte>
+    <version.hibernate-spatial>5.3.6.Final</version.hibernate-spatial>
+    <version.geolatte>1.4.0</version.geolatte>
     <version.vividsolutions-jts>1.13</version.vividsolutions-jts>
 
-    <version.eclipse.link>2.6.2</version.eclipse.link>
+    <version.eclipse.link>2.7.3</version.eclipse.link>
 
     <version.com.orbitz.consul>1.2.1</version.com.orbitz.consul>
 
+    <!-- TODO update to 7.0.0.Final when released -->
     <version.openshift.client>6.1.2.Final</version.openshift.client>
+    <!-- TODO update to whatever OpenShift Java Rest Client uses when updated to 7.0.0.Final; currently it's 3.11.0 -->
     <version.com.squareup.okhttp>3.9.0</version.com.squareup.okhttp>
+    <!-- TODO remove the okhttp-openshift stuff when updating OpenShift Java Rest Client to 7.0.0.Final -->
     <!-- THORN-2165 Align okhttp and okhttp-ws for topology-openshift as there is API dependency and okhttp-ws has older version -->
     <version.com.squareup.okhttp-openshift>3.4.2</version.com.squareup.okhttp-openshift>
     <version.com.squareup.okio>1.9.0</version.com.squareup.okio>
@@ -300,17 +303,17 @@
         <artifactId>mongo-config-api</artifactId>
         <version>${version.mongo.config-api}</version>
       </dependency>
-     <dependency>
+      <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>cassandra-config-api</artifactId>
         <version>${version.cassandra.config-api}</version>
       </dependency>
-     <dependency>
+      <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>neo4j-config-api</artifactId>
         <version>${version.neo4j.config-api}</version>
       </dependency>
-     <dependency>
+      <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>orientdb-config-api</artifactId>
         <version>${version.orientdb.config-api}</version>
@@ -332,23 +335,17 @@
         <version>${version.maven-plugin-plugin}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.jboss.spec.javax.sql</groupId>
-        <artifactId>jboss-javax-sql-api_7.0_spec</artifactId>
-        <version>${version.org.jboss.spec.javax.sql.jboss-javax-sql-api_7.0_spec}</version>
-      </dependency>
-
       <!-- Needed by fraction-metadata -->
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>${version.org.objectweb.asm}</version>
+        <version>${version.org.ow2.asm}</version>
       </dependency>
 
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-commons</artifactId>
-        <version>${version.org.objectweb.asm}</version>
+        <version>${version.org.ow2.asm}</version>
       </dependency>
 
       <!-- Used by SwarmTool -->

diff --git a/core/container/src/main/resources/modules/org/ow2/asm/impl/module.xml b/core/container/src/main/resources/modules/org/ow2/asm/impl/module.xml
@@ -10,8 +10,8 @@
     <property name="jboss.api" value="private"/>
   </properties>
   <resources>
-    <artifact name="org.ow2.asm:asm:${version.org.objectweb.asm}"/>
-    <artifact name="org.ow2.asm:asm-commons:${version.org.objectweb.asm}"/>
+    <artifact name="org.ow2.asm:asm:${version.org.ow2.asm}"/>
+    <artifact name="org.ow2.asm:asm-commons:${version.org.ow2.asm}"/>
   </resources>
 
 </module>
diff --git a/docs/howto/autodetect-fractions/pom.xml b/docs/howto/autodetect-fractions/pom.xml
@@ -125,7 +125,7 @@
     <!-- tag::jaxrs[] -->
     <dependency>
       <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
       <version>${version.jaxrs-api}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/docs/howto/create-a-datasource/pom.xml b/docs/howto/create-a-datasource/pom.xml
@@ -138,7 +138,7 @@
 
     <dependency>
       <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
       <version>${version.jaxrs-api}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/docs/howto/create-a-hollow-jar/pom.xml b/docs/howto/create-a-hollow-jar/pom.xml
@@ -127,7 +127,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
       <version>${version.jaxrs-api}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/docs/howto/create-an-uberjar/pom.xml b/docs/howto/create-an-uberjar/pom.xml
@@ -124,7 +124,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
       <version>${version.jaxrs-api}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/fractions/javaee/undertow/pom.xml b/fractions/javaee/undertow/pom.xml
@@ -116,7 +116,7 @@
     <!-- Provided APIs -->
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>
-      <artifactId>jboss-servlet-api_3.1_spec</artifactId>
+      <artifactId>jboss-servlet-api_4.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.websocket</groupId>

diff --git a/fractions/topology-webapp/pom.xml b/fractions/topology-webapp/pom.xml
@@ -63,7 +63,7 @@
 
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>
-      <artifactId>jboss-servlet-api_3.1_spec</artifactId>
+      <artifactId>jboss-servlet-api_4.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/release/fetch-notes.js b/release/fetch-notes.js
@@ -45,7 +45,7 @@ https.get( 'https://issues.jboss.org/rest/api/latest/search?maxResults=100&jql=p
           console.log( '* [https://issues.jboss.org/browse/' + e.key + '[' + e.key + ']] ' + e.fields.summary + ' (' + e.fields.resolution.name + ')' );
         }
       } );
-      console.log( " " );
+      console.log();
     } );
     if (breaking.length > 0) {
       console.log("== Breaking changes");

diff --git a/swarmtool/pom.xml b/swarmtool/pom.xml
@@ -93,12 +93,6 @@
     <dependency>
       <groupId>io.thorntail</groupId>
       <artifactId>tools</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.sql</groupId>
-          <artifactId>jboss-javax-sql-api_7.0_spec</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.thorntail</groupId>

diff --git a/testsuite/microprofile-tcks/restclient/pom.xml b/testsuite/microprofile-tcks/restclient/pom.xml
@@ -96,13 +96,6 @@
          <scope>test</scope>
       </dependency>
 
-      <dependency>
-         <groupId>com.github.tomakehurst</groupId>
-         <artifactId>wiremock</artifactId>
-         <version>2.10.1</version>
-         <scope>test</scope>
-      </dependency>
-
       <dependency>
          <groupId>javax.json</groupId>
          <artifactId>javax.json-api</artifactId>
@@ -128,7 +121,7 @@
       <dependency>
          <groupId>com.github.tomakehurst</groupId>
          <artifactId>wiremock</artifactId>
-         <version>2.7.0</version>
+         <version>2.10.1</version>
          <scope>test</scope>
          <exclusions>
             <exclusion>

diff --git a/...stsuite-maven-plugin/src/test/java/org/wildfly/swarm/maven/plugin/IncludedTechnology.java b/...stsuite-maven-plugin/src/test/java/org/wildfly/swarm/maven/plugin/IncludedTechnology.java
@@ -23,9 +23,9 @@
  * A Java EE technology that is used in the testing project. It always corresponds to a fraction.
  */
 public enum IncludedTechnology {
-    SERVLET("undertow", "org.jboss.spec.javax.servlet", "jboss-servlet-api_3.0_spec", "1.0.2.Final"),
-    JAX_RS("jaxrs", "org.jboss.spec.javax.ws.rs", "jboss-jaxrs-api_2.0_spec", "1.0.0.Final", SERVLET),
-    EJB("ejb", "org.jboss.spec.javax.ejb", "jboss-ejb-api_3.2_spec", "1.0.0.Final", SERVLET), // transitively depends on servlet
+    SERVLET("undertow", "org.jboss.spec.javax.servlet", "jboss-servlet-api_4.0_spec", "1.0.0.Final"),
+    JAX_RS("jaxrs", "org.jboss.spec.javax.ws.rs", "jboss-jaxrs-api_2.1_spec", "1.0.1.Final", SERVLET),
+    EJB("ejb", "org.jboss.spec.javax.ejb", "jboss-ejb-api_3.2_spec", "1.0.1.Final", SERVLET), // transitively depends on servlet
     // the remaining technologies are NOT supposed to be used in the testing project;
     // instead, they are listed to facilitate checking that they aren't present by some mistake
     EJB_REMOTE("ejb-remote", null, null, null),

diff --git a/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java b/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java
@@ -36,8 +36,8 @@ public class DependencyManagerTest {
 
     private static MockArtifactResolver RESOLVER = new MockArtifactResolver();
 
-    private static ArtifactSpec SERVLET_SPEC = simple("org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec:jar:1.0.0.Final");
-    private static ArtifactSpec JAXRS_SPEC = simple("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.0.Final", (config)->{
+    private static ArtifactSpec SERVLET_SPEC = simple("org.jboss.spec.javax.servlet:jboss-servlet-api_4.0_spec:jar:1.0.0.Final");
+    private static ArtifactSpec JAXRS_SPEC = simple("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:1.0.1.Final", (config)->{
         config.addDependency( SERVLET_SPEC );
     });