Clean up and update dependencies (#82)

SilverThings · Jan 27, 2017 · 55425bc · 55425bc
1 parent 0b46769
commit 55425bc
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 66 deletions.
diff --git a/activemq-microservice-provider/pom.xml b/activemq-microservice-provider/pom.xml
@@ -26,18 +26,15 @@
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-jms-client</artifactId>
-         <version>1.2.0</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-jms-server</artifactId>
-         <version>1.2.0</version>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-all</artifactId>
-         <version>5.13.2</version>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/...ion/src/main/java/io/silverware/microservices/providers/camel/CamelCdiContextFactory.java b/...ion/src/main/java/io/silverware/microservices/providers/camel/CamelCdiContextFactory.java
@@ -2,7 +2,7 @@
  * -----------------------------------------------------------------------\
  * SilverWare
  *  
- * Copyright (C) 2015 the original author or authors.
+ * Copyright (C) 2015 - 2017 the original author or authors.
  *  
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import io.silverware.microservices.util.Utils;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.cdi.internal.CamelContextMap;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -62,8 +61,7 @@ public CamelContext createCamelContext(final Context context) {
          if (cdiSilverService.isDeployed()) {
             log.info("CDI SilverService connected successfully!");
 
-            CamelContextMap camelContextMap = cdiSilverService.findByType(CamelContextMap.class);
-            return camelContextMap.getCamelContext("camel-1");
+            return cdiSilverService.findByType(CamelContext.class);
          } else {
             log.warn("CDI deployment took to long, trying to continue.");
          }

diff --git a/camel-microservice-provider/pom.xml b/camel-microservice-provider/pom.xml
@@ -17,10 +17,6 @@
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-core</artifactId>
       </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-databind</artifactId>
-      </dependency>
    </dependencies>
    <build>
       <plugins>

diff --git a/cdi-microservice-provider/pom.xml b/cdi-microservice-provider/pom.xml
@@ -21,26 +21,10 @@
          <groupId>org.jboss.weld.se</groupId>
          <artifactId>weld-se</artifactId>
       </dependency>
-      <dependency>
-         <groupId>javax.ejb</groupId>
-         <artifactId>ejb-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.javassist</groupId>
          <artifactId>javassist</artifactId>
       </dependency>
-      <dependency>
-         <groupId>io.vertx</groupId>
-         <artifactId>vertx-core</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>io.vertx</groupId>
-         <artifactId>vertx-web</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>commons-beanutils</groupId>
-         <artifactId>commons-beanutils</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jmockit</groupId>
          <artifactId>jmockit</artifactId>

diff --git a/...rovider/src/main/java/io/silverware/microservices/providers/cdi/util/VersionResolver.java b/...rovider/src/main/java/io/silverware/microservices/providers/cdi/util/VersionResolver.java
@@ -1,8 +1,8 @@
 /*
  * -----------------------------------------------------------------------\
  * SilverWare
- *  
- * Copyright (C) 2015 - 2016 the original author or authors.
+ *
+ * Copyright (C) 2016 - 2017 the original author or authors.
  *  
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.netty.util.internal.StringUtil;
-
 /**
  * This class is used for resolving of api and implementation versions.
  * The resolution process takes the first version which is provided for the microservice from following list
@@ -176,7 +174,7 @@ String resolveVersionFromInterfacesClasses(final Class clazz, Function<Microserv
       Class[] interfaces = clazz.getInterfaces();
       List<String> versions = Arrays.stream(interfaces)
                                     .map(i -> resolveVersionFromAnnotations(Arrays.stream(i.getAnnotations()), lambda))
-                                    .filter(v -> !StringUtil.isNullOrEmpty(v))
+                                    .filter(v -> v != null && !v.isEmpty())
                                     .collect(toList());
       if (versions.size() > 1) {
          throw new IllegalArgumentException(String.format(MORE_MICROSERVICE_VERSIONS_FOUND, clazz.getName()));

diff --git a/http-invoker-microservice-provider/pom.xml b/http-invoker-microservice-provider/pom.xml
@@ -25,10 +25,6 @@
          <version>${project.version}</version>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.javassist</groupId>
-         <artifactId>javassist</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.cedarsoftware</groupId>
          <artifactId>json-io</artifactId>

diff --git a/hystrix-microservice-provider/pom.xml b/hystrix-microservice-provider/pom.xml
@@ -15,6 +15,10 @@
 
    <dependencies>
       <!-- internal -->
+      <dependency>
+         <groupId>io.silverware</groupId>
+         <artifactId>microservices</artifactId>
+      </dependency>
       <dependency>
          <groupId>io.silverware</groupId>
          <artifactId>cdi-microservice-provider</artifactId>

diff --git a/microservices-bom/pom.xml b/microservices-bom/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>io.silverware</groupId>
    <artifactId>microservices-bom</artifactId>
@@ -51,34 +51,36 @@
       </repository>
    </distributionManagement>
    <properties>
-      <version.maven.gpg.plugin>1.5</version.maven.gpg.plugin>
+      <version.maven.gpg.plugin>1.6</version.maven.gpg.plugin>
 
       <version.reflections>0.9.10</version.reflections>
-      <version.log4j>2.5</version.log4j>
-      <version.testng>6.9.10</version.testng>
-      <version.apache.camel>2.16.1</version.apache.camel>
-      <version.slf4j>1.7.13</version.slf4j>
+      <version.log4j>2.7</version.log4j>
+      <version.testng>6.10</version.testng>
+      <version.apache.camel>2.18.1</version.apache.camel>
+      <version.slf4j>1.7.22</version.slf4j>
       <version.weld>2.4.1.Final</version.weld>
       <version.ejb.api>3.0</version.ejb.api>
       <version.jboss.logging>3.3.0.Final</version.jboss.logging>
-      <version.jgroups>3.6.6.Final</version.jgroups>
+      <version.jgroups>3.6.12.Final</version.jgroups>
       <version.commons.cli>1.3.1</version.commons.cli>
-      <version.commons.lang>3.4</version.commons.lang>
-      <version.findbugs>1.3.2</version.findbugs>
-      <version.javassist>3.20.0-GA</version.javassist>
-      <version.undertow>1.4.4.Final</version.undertow>
-      <version.jolokia>1.3.2</version.jolokia>
-      <version.jackson>2.6.4</version.jackson>
-      <version.vertx>3.2.0</version.vertx>
-      <version.jsonio>4.3.0</version.jsonio>
-      <version.beanutils>1.9.2</version.beanutils>
+      <version.commons.lang>3.5</version.commons.lang>
+      <version.findbugs>2.0.1</version.findbugs>
+      <version.javassist>3.21.0-GA</version.javassist>
+      <version.undertow>1.4.8.Final</version.undertow>
+      <version.jolokia>1.3.5</version.jolokia>
+      <version.jackson>2.7.8</version.jackson>
+      <version.vertx>3.3.3</version.vertx>
+      <version.jsonio>4.9.6</version.jsonio>
+      <version.beanutils>1.9.3</version.beanutils>
       <version.drools>6.5.0.Final</version.drools>
-      <version.jmockit>1.29</version.jmockit>
+      <version.jmockit>1.30</version.jmockit>
       <version.assertj>3.5.2</version.assertj>
-      <version.resteasy>3.0.19.Final</version.resteasy>
+      <version.resteasy>3.1.0.Final</version.resteasy>
       <version.sem.ver>2.0.1</version.sem.ver>
       <version.hystrix>1.5.9</version.hystrix>
-      <version.mockito>2.2.22</version.mockito>
+      <version.mockito>2.6.3</version.mockito>
+      <version.activemq>5.14.3</version.activemq>
+      <version.activemq.artemis>1.5.1</version.activemq.artemis>
       <java.level>1.8</java.level>
    </properties>
    <dependencyManagement>
@@ -153,6 +155,21 @@
             <artifactId>reflections</artifactId>
             <version>${version.reflections}</version>
          </dependency>
+         <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-all</artifactId>
+            <version>${version.activemq}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jms-client</artifactId>
+            <version>${version.activemq.artemis}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jms-server</artifactId>
+            <version>${version.activemq.artemis}</version>
+         </dependency>
          <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
@@ -268,7 +285,7 @@
             <version>${version.commons.lang}</version>
          </dependency>
          <dependency>
-            <groupId>net.sourceforge.findbugs</groupId>
+            <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
             <version>${version.findbugs}</version>
             <scope>provided</scope>
@@ -304,6 +321,11 @@
             <type>war</type>
             <version>${version.jolokia}</version>
          </dependency>
+         <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${version.jackson}</version>
+         </dependency>
          <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -329,6 +351,16 @@
             <artifactId>vertx-web</artifactId>
             <version>${version.vertx}</version>
          </dependency>
+         <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-lang-groovy</artifactId>
+            <version>${version.vertx}</version>
+         </dependency>
+         <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-lang-js</artifactId>
+            <version>${version.vertx}</version>
+         </dependency>
          <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

diff --git a/microservices/pom.xml b/microservices/pom.xml
@@ -21,6 +21,10 @@
          <groupId>com.cedarsoftware</groupId>
          <artifactId>json-io</artifactId>
       </dependency>
+      <dependency>
+         <groupId>com.google.code.findbugs</groupId>
+         <artifactId>annotations</artifactId>
+      </dependency>
       <dependency>
          <groupId>com.vdurmont</groupId>
          <artifactId>semver4j</artifactId>

diff --git a/microservices/src/main/java/io/silverware/microservices/Boot.java b/microservices/src/main/java/io/silverware/microservices/Boot.java
@@ -2,7 +2,7 @@
  * -----------------------------------------------------------------------\
  * SilverWare
  *  
- * Copyright (C) 2015 the original author or authors.
+ * Copyright (C) 2015 - 2017 the original author or authors.
  *  
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,12 +40,14 @@
 import java.util.Map;
 import java.util.Properties;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Main class to boot the Microservices platforms.
  *
  * @author <a href="mailto:[email protected]">Martin Večeřa</a>
  */
-@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DM_EXIT", justification = "This class is allowed to terminate the JVM.")
+@SuppressFBWarnings(value = "DM_EXIT", justification = "This class is allowed to terminate the JVM.")
 public final class Boot {
 
    private static final Logger log = LogManager.getLogger(Boot.class);

diff --git a/pom.xml b/pom.xml
@@ -124,11 +124,6 @@
          <artifactId>testng</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>net.sourceforge.findbugs</groupId>
-         <artifactId>annotations</artifactId>
-         <scope>provided</scope>
-      </dependency>
    </dependencies>
    <build>
       <plugins>

diff --git a/vertx-microservice-provider/pom.xml b/vertx-microservice-provider/pom.xml
@@ -16,7 +16,6 @@
    <properties>
       <version.gmaven>1.5</version.gmaven>
       <version.groovy>2.4.6</version.groovy>
-      <version.vertx.extension>3.2.0</version.vertx.extension>
    </properties>
 
    <dependencies>
@@ -31,12 +30,10 @@
       <dependency>
          <groupId>io.vertx</groupId>
          <artifactId>vertx-lang-groovy</artifactId>
-         <version>${version.vertx.extension}</version>
       </dependency>
       <dependency>
          <groupId>io.vertx</groupId>
          <artifactId>vertx-lang-js</artifactId>
-         <version>${version.vertx.extension}</version>
          <scope>test</scope>
       </dependency>
       <dependency>