Merge pull request #1013 from secondsun/updates

Updating dependencies Note : I'm approving this merge. The changes have been tested locally, but the build is failing because maven central is still syncing.
aerogear · Mar 1, 2019 · 41befbb · 41befbb
2 parents 9ec58e4 + e9ba6cc
commit 41befbb
Show file tree

Hide file tree

Showing 11 changed files with 420 additions and 371 deletions.
diff --git a/databases/prepare_clean_mysql_wildfly.sh b/databases/prepare_clean_mysql_wildfly.sh
@@ -8,7 +8,7 @@ else
     printf "😂 Awesome, WildFly 11 is configured!\n"
     printf "   >>> Preparing the MySQL DB module\n"
     cp -r ./src/main/resources/modules/com $WILDFLY_HOME/modules
-    mvn dependency:copy -Dartifact=mysql:mysql-connector-java:5.1.44 -DoutputDirectory=$WILDFLY_HOME/modules/com/mysql/jdbc/main/  
+    mvn dependency:copy -Dartifact=mysql:mysql-connector-java:8.0.15 -DoutputDirectory=$WILDFLY_HOME/modules/com/mysql/jdbc/main/  
     printf "WildFly 11 DB configuration is about to start\n"
     printf "   >>> Running the jboss-cli tool!\n"
     $WILDFLY_HOME/bin/jboss-cli.sh --file=./mysql-database-config-wildfly.cli

diff --git a/databases/src/main/resources/modules/com/mysql/jdbc/main/module.xml b/databases/src/main/resources/modules/com/mysql/jdbc/main/module.xml
@@ -17,7 +17,7 @@
 -->
 <module xmlns="urn:jboss:module:1.0" name="com.mysql.jdbc">
   <resources>
-    <resource-root path="mysql-connector-java-5.1.44.jar"/>
+    <resource-root path="mysql-connector-java-8.0.15.jar"/>
         <!-- Insert resources here -->
   </resources>
   <dependencies>

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
@@ -86,9 +86,20 @@
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-patch</artifactId>
-            <version>1.7</version>
+            <version>1.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.0.1-jre</version>
+        </dependency>
+
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_common</artifactId>
@@ -161,7 +172,8 @@
                 <dependency>
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-validator</artifactId>
-                    <version>4.2.0.Final</version>
+                    <version>4.3.2.Final</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/migrator/pom.xml b/migrator/pom.xml
@@ -13,18 +13,29 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.3.2</version>
+            <version>3.6.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.18</version>
+            <version>8.0.15</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>9.2-1004-jdbc41</version>
         </dependency>
+        <dependency>
+             <groupId>ch.qos.logback</groupId> 
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.2</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/migrator/src/test/java/org/jboss/aerogear/unifiedpush/migrator/MigratorTest.java b/migrator/src/test/java/org/jboss/aerogear/unifiedpush/migrator/MigratorTest.java
@@ -34,7 +34,7 @@ public class MigratorTest {
     private Database database;
     private ResourceAccessor resourceAccessor;
     private EmbeddedMysqlDatabase embeddedMysqlDatabase;
-
+    
     @Before
     public void init() throws Exception {
         initResourceAccessor();

diff --git a/model/api/pom.xml b/model/api/pom.xml
@@ -42,6 +42,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+      </dependency>
 
     </dependencies>
 

diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
@@ -118,19 +118,19 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-                    <version>1.0.0.CR3</version>
+                    <version>1.0.0.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.weld</groupId>
                     <artifactId>weld-core</artifactId>
-                    <version>1.1.5.Final</version>
+                    <version>1.1.34.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-nop</artifactId>
-                    <version>1.6.4</version>
+                    <version>1.7.26</version>
                 </dependency>
                 <dependency>
                     <groupId>net.jakubholy.testing</groupId>
@@ -141,7 +141,7 @@
                 <dependency>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
-                    <version>1.6.1</version>
+                    <version>1.7.26</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

diff --git a/model/jpa/src/test/java/org/jboss/aerogear/unifiedpush/jpa/VariantDaoTest.java b/model/jpa/src/test/java/org/jboss/aerogear/unifiedpush/jpa/VariantDaoTest.java
@@ -40,7 +40,7 @@
 
 @RunWith(Arquillian.class)
 public class VariantDaoTest {
-
+    
     @Inject
     private EntityManager entityManager;
     @Inject

diff --git a/model/push/pom.xml b/model/push/pom.xml
@@ -31,6 +31,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ @@
     @RunWith(Arquillian.class)
     public class VariantDaoTest {
         @Inject
         private EntityManager entityManager;
         @Inject
@@ Expand Down @@