Skip to content

Commit 55425bc

Browse files
livthomaslivthomas
authored
Clean up and update dependencies (#82)
1 parent 0b46769 commit 55425bc

File tree

12 files changed

+69
-66
lines changed

12 files changed

+69
-66
lines changed

‎activemq-microservice-provider/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,15 @@
2626
<dependency>
2727
<groupId>org.apache.activemq</groupId>
2828
<artifactId>artemis-jms-client</artifactId>
29-
<version>1.2.0</version>
3029
</dependency>
3130
<dependency>
3231
<groupId>org.apache.activemq</groupId>
3332
<artifactId>artemis-jms-server</artifactId>
34-
<version>1.2.0</version>
3533
<scope>test</scope>
3634
</dependency>
3735
<dependency>
3836
<groupId>org.apache.activemq</groupId>
3937
<artifactId>activemq-all</artifactId>
40-
<version>5.13.2</version>
4138
<scope>test</scope>
4239
</dependency>
4340
</dependencies>

‎camel-cdi-integration/src/main/java/io/silverware/microservices/providers/camel/CamelCdiContextFactory.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* -----------------------------------------------------------------------\
33
* SilverWare
44
*  
5-
* Copyright (C) 2015 the original author or authors.
5+
* Copyright (C) 2015 - 2017 the original author or authors.
66
*  
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
2424
import io.silverware.microservices.util.Utils;
2525

2626
import org.apache.camel.CamelContext;
27-
import org.apache.camel.cdi.internal.CamelContextMap;
2827
import org.apache.camel.impl.DefaultCamelContext;
2928
import org.apache.logging.log4j.LogManager;
3029
import org.apache.logging.log4j.Logger;
@@ -62,8 +61,7 @@ public CamelContext createCamelContext(final Context context) {
6261
if (cdiSilverService.isDeployed()) {
6362
log.info("CDI SilverService connected successfully!");
6463

65-
CamelContextMap camelContextMap = cdiSilverService.findByType(CamelContextMap.class);
66-
return camelContextMap.getCamelContext("camel-1");
64+
return cdiSilverService.findByType(CamelContext.class);
6765
} else {
6866
log.warn("CDI deployment took to long, trying to continue.");
6967
}

‎camel-microservice-provider/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>org.apache.camel</groupId>
1818
<artifactId>camel-core</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.fasterxml.jackson.core</groupId>
22-
<artifactId>jackson-databind</artifactId>
23-
</dependency>
2420
</dependencies>
2521
<build>
2622
<plugins>

‎cdi-microservice-provider/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,10 @@
2121
<groupId>org.jboss.weld.se</groupId>
2222
<artifactId>weld-se</artifactId>
2323
</dependency>
24-
<dependency>
25-
<groupId>javax.ejb</groupId>
26-
<artifactId>ejb-api</artifactId>
27-
</dependency>
2824
<dependency>
2925
<groupId>org.javassist</groupId>
3026
<artifactId>javassist</artifactId>
3127
</dependency>
32-
<dependency>
33-
<groupId>io.vertx</groupId>
34-
<artifactId>vertx-core</artifactId>
35-
</dependency>
36-
<dependency>
37-
<groupId>io.vertx</groupId>
38-
<artifactId>vertx-web</artifactId>
39-
</dependency>
40-
<dependency>
41-
<groupId>commons-beanutils</groupId>
42-
<artifactId>commons-beanutils</artifactId>
43-
</dependency>
4428
<dependency>
4529
<groupId>org.jmockit</groupId>
4630
<artifactId>jmockit</artifactId>

‎cdi-microservice-provider/src/main/java/io/silverware/microservices/providers/cdi/util/VersionResolver.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* -----------------------------------------------------------------------\
33
* SilverWare
4-
*
5-
* Copyright (C) 2015 - 2016 the original author or authors.
4+
*
5+
* Copyright (C) 2016 - 2017 the original author or authors.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -39,8 +39,6 @@
3939
import java.util.stream.Collectors;
4040
import java.util.stream.Stream;
4141

42-
import io.netty.util.internal.StringUtil;
43-
4442
/**
4543
* This class is used for resolving of api and implementation versions.
4644
* 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
176174
Class[] interfaces = clazz.getInterfaces();
177175
List<String> versions = Arrays.stream(interfaces)
178176
.map(i -> resolveVersionFromAnnotations(Arrays.stream(i.getAnnotations()), lambda))
179-
.filter(v -> !StringUtil.isNullOrEmpty(v))
177+
.filter(v -> v != null && !v.isEmpty())
180178
.collect(toList());
181179
if (versions.size() > 1) {
182180
throw new IllegalArgumentException(String.format(MORE_MICROSERVICE_VERSIONS_FOUND, clazz.getName()));

‎http-invoker-microservice-provider/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<version>${project.version}</version>
2626
<scope>test</scope>
2727
</dependency>
28-
<dependency>
29-
<groupId>org.javassist</groupId>
30-
<artifactId>javassist</artifactId>
31-
</dependency>
3228
<dependency>
3329
<groupId>com.cedarsoftware</groupId>
3430
<artifactId>json-io</artifactId>

‎hystrix-microservice-provider/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515

1616
<dependencies>
1717
<!-- internal -->
18+
<dependency>
19+
<groupId>io.silverware</groupId>
20+
<artifactId>microservices</artifactId>
21+
</dependency>
1822
<dependency>
1923
<groupId>io.silverware</groupId>
2024
<artifactId>cdi-microservice-provider</artifactId>

‎microservices-bom/pom.xml‎

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.silverware</groupId>
55
<artifactId>microservices-bom</artifactId>
@@ -51,34 +51,36 @@
5151
</repository>
5252
</distributionManagement>
5353
<properties>
54-
<version.maven.gpg.plugin>1.5</version.maven.gpg.plugin>
54+
<version.maven.gpg.plugin>1.6</version.maven.gpg.plugin>
5555

5656
<version.reflections>0.9.10</version.reflections>
57-
<version.log4j>2.5</version.log4j>
58-
<version.testng>6.9.10</version.testng>
59-
<version.apache.camel>2.16.1</version.apache.camel>
60-
<version.slf4j>1.7.13</version.slf4j>
57+
<version.log4j>2.7</version.log4j>
58+
<version.testng>6.10</version.testng>
59+
<version.apache.camel>2.18.1</version.apache.camel>
60+
<version.slf4j>1.7.22</version.slf4j>
6161
<version.weld>2.4.1.Final</version.weld>
6262
<version.ejb.api>3.0</version.ejb.api>
6363
<version.jboss.logging>3.3.0.Final</version.jboss.logging>
64-
<version.jgroups>3.6.6.Final</version.jgroups>
64+
<version.jgroups>3.6.12.Final</version.jgroups>
6565
<version.commons.cli>1.3.1</version.commons.cli>
66-
<version.commons.lang>3.4</version.commons.lang>
67-
<version.findbugs>1.3.2</version.findbugs>
68-
<version.javassist>3.20.0-GA</version.javassist>
69-
<version.undertow>1.4.4.Final</version.undertow>
70-
<version.jolokia>1.3.2</version.jolokia>
71-
<version.jackson>2.6.4</version.jackson>
72-
<version.vertx>3.2.0</version.vertx>
73-
<version.jsonio>4.3.0</version.jsonio>
74-
<version.beanutils>1.9.2</version.beanutils>
66+
<version.commons.lang>3.5</version.commons.lang>
67+
<version.findbugs>2.0.1</version.findbugs>
68+
<version.javassist>3.21.0-GA</version.javassist>
69+
<version.undertow>1.4.8.Final</version.undertow>
70+
<version.jolokia>1.3.5</version.jolokia>
71+
<version.jackson>2.7.8</version.jackson>
72+
<version.vertx>3.3.3</version.vertx>
73+
<version.jsonio>4.9.6</version.jsonio>
74+
<version.beanutils>1.9.3</version.beanutils>
7575
<version.drools>6.5.0.Final</version.drools>
76-
<version.jmockit>1.29</version.jmockit>
76+
<version.jmockit>1.30</version.jmockit>
7777
<version.assertj>3.5.2</version.assertj>
78-
<version.resteasy>3.0.19.Final</version.resteasy>
78+
<version.resteasy>3.1.0.Final</version.resteasy>
7979
<version.sem.ver>2.0.1</version.sem.ver>
8080
<version.hystrix>1.5.9</version.hystrix>
81-
<version.mockito>2.2.22</version.mockito>
81+
<version.mockito>2.6.3</version.mockito>
82+
<version.activemq>5.14.3</version.activemq>
83+
<version.activemq.artemis>1.5.1</version.activemq.artemis>
8284
<java.level>1.8</java.level>
8385
</properties>
8486
<dependencyManagement>
@@ -153,6 +155,21 @@
153155
<artifactId>reflections</artifactId>
154156
<version>${version.reflections}</version>
155157
</dependency>
158+
<dependency>
159+
<groupId>org.apache.activemq</groupId>
160+
<artifactId>activemq-all</artifactId>
161+
<version>${version.activemq}</version>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.apache.activemq</groupId>
165+
<artifactId>artemis-jms-client</artifactId>
166+
<version>${version.activemq.artemis}</version>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.apache.activemq</groupId>
170+
<artifactId>artemis-jms-server</artifactId>
171+
<version>${version.activemq.artemis}</version>
172+
</dependency>
156173
<dependency>
157174
<groupId>org.apache.logging.log4j</groupId>
158175
<artifactId>log4j-api</artifactId>
@@ -268,7 +285,7 @@
268285
<version>${version.commons.lang}</version>
269286
</dependency>
270287
<dependency>
271-
<groupId>net.sourceforge.findbugs</groupId>
288+
<groupId>com.google.code.findbugs</groupId>
272289
<artifactId>annotations</artifactId>
273290
<version>${version.findbugs}</version>
274291
<scope>provided</scope>
@@ -304,6 +321,11 @@
304321
<type>war</type>
305322
<version>${version.jolokia}</version>
306323
</dependency>
324+
<dependency>
325+
<groupId>com.fasterxml.jackson.core</groupId>
326+
<artifactId>jackson-core</artifactId>
327+
<version>${version.jackson}</version>
328+
</dependency>
307329
<dependency>
308330
<groupId>com.fasterxml.jackson.core</groupId>
309331
<artifactId>jackson-databind</artifactId>
@@ -329,6 +351,16 @@
329351
<artifactId>vertx-web</artifactId>
330352
<version>${version.vertx}</version>
331353
</dependency>
354+
<dependency>
355+
<groupId>io.vertx</groupId>
356+
<artifactId>vertx-lang-groovy</artifactId>
357+
<version>${version.vertx}</version>
358+
</dependency>
359+
<dependency>
360+
<groupId>io.vertx</groupId>
361+
<artifactId>vertx-lang-js</artifactId>
362+
<version>${version.vertx}</version>
363+
</dependency>
332364
<dependency>
333365
<groupId>commons-beanutils</groupId>
334366
<artifactId>commons-beanutils</artifactId>

‎microservices/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<groupId>com.cedarsoftware</groupId>
2222
<artifactId>json-io</artifactId>
2323
</dependency>
24+
<dependency>
25+
<groupId>com.google.code.findbugs</groupId>
26+
<artifactId>annotations</artifactId>
27+
</dependency>
2428
<dependency>
2529
<groupId>com.vdurmont</groupId>
2630
<artifactId>semver4j</artifactId>

‎microservices/src/main/java/io/silverware/microservices/Boot.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* -----------------------------------------------------------------------\
33
* SilverWare
44
*  
5-
* Copyright (C) 2015 the original author or authors.
5+
* Copyright (C) 2015 - 2017 the original author or authors.
66
*  
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -40,12 +40,14 @@
4040
import java.util.Map;
4141
import java.util.Properties;
4242

43+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
44+
4345
/**
4446
* Main class to boot the Microservices platforms.
4547
*
4648
* @author <a href="mailto:[email protected]">Martin Večeřa</a>
4749
*/
48-
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DM_EXIT", justification = "This class is allowed to terminate the JVM.")
50+
@SuppressFBWarnings(value = "DM_EXIT", justification = "This class is allowed to terminate the JVM.")
4951
public final class Boot {
5052

5153
private static final Logger log = LogManager.getLogger(Boot.class);

0 commit comments

Comments
 (0)