Upgrade to shed 1.1.3, Guice to 4.2.0

Author: adrienlauer

CHANGELOG.md

@@ -1,7 +1,9 @@
-# Version 3.5.1 (2018-04-28)
+# Version 3.5.1 (2018-05-04)
 
 * [new] Add an implementation of `javax.annotation.Nullable` avoiding the need of an additional dependency for null injection. 
 * [chg] Remove the need for `jaxb-api` dependency for `seed-rest-jersey2` module under Java 9.
+* [chg] Update Guice to [4.2.0](https://github.com/google/guice/wiki/Guice42).
+* [chg] Update Guava to [25.0](https://github.com/google/guava/releases/tag/v25.0).
 
 # Version 3.5.0 (2018-03-16)
 

core/pom.xml

@@ -57,16 +57,22 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
             <version>${guice.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
+            <artifactId>guice-assistedinject</artifactId>
             <version>${guice.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-assistedinject</artifactId>
-            <version>${guice.version}</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

core/src/main/java/org/seedstack/seed/core/internal/utils/MethodMatcherBuilder.java

@@ -21,21 +21,23 @@ public MethodMatcherBuilder(Predicate<Method> predicate) {
         this.predicate = predicate;
     }
 
-    public MethodMatcherBuilder and(Predicate<? super Method>... others) {
+    @SafeVarargs
+    public final MethodMatcherBuilder and(Predicate<? super Method>... others) {
         for (Predicate<? super Method> other : others) {
             predicate = predicate.and(other);
         }
         return this;
     }
 
-    public MethodMatcherBuilder or(Predicate<? super Method>... others) {
+    @SafeVarargs
+    public final MethodMatcherBuilder or(Predicate<? super Method>... others) {
         for (Predicate<? super Method> other : others) {
             predicate = predicate.or(other);
         }
         return this;
     }
 
-    public MethodMatcherBuilder negate() {
+    public final MethodMatcherBuilder negate() {
         predicate = predicate.negate();
         return this;
     }

core/src/main/java/org/seedstack/seed/core/internal/utils/SpecificationBuilder.java

@@ -19,21 +19,23 @@ public SpecificationBuilder(Predicate<T> predicate) {
         this.predicate = predicate;
     }
 
-    public SpecificationBuilder and(Predicate<? super T>... others) {
+    @SafeVarargs
+    public final SpecificationBuilder and(Predicate<? super T>... others) {
         for (Predicate<? super T> other : others) {
             predicate = predicate.and(other);
         }
         return this;
     }
 
-    public SpecificationBuilder or(Predicate<? super T>... others) {
+    @SafeVarargs
+    public final SpecificationBuilder or(Predicate<? super T>... others) {
         for (Predicate<? super T> other : others) {
             predicate = predicate.or(other);
         }
         return this;
     }
 
-    public SpecificationBuilder negate() {
+    public final SpecificationBuilder negate() {
         predicate = predicate.negate();
         return this;
     }

pom.xml

@@ -25,10 +25,11 @@
     <properties>
         <nuun-kernel.version>1.0.M9</nuun-kernel.version>
         <javassist.version>3.22.0-GA</javassist.version>
-        <shed.version>1.1.2</shed.version>
+        <shed.version>1.1.3</shed.version>
         <coffig.version>3.1.0</coffig.version>
         <commons-cli.version>1.4</commons-cli.version>
-        <guice.version>4.1.0</guice.version>
+        <guice.version>4.2.0</guice.version>
+        <guava.version>25.0-jre</guava.version>
         <typetools.version>0.5.0</typetools.version>
         <shiro.version>1.4.0</shiro.version>
         <undertow.version>1.4.22.Final</undertow.version>
@@ -66,6 +67,7 @@
                             <includedLicense>BSD</includedLicense>
                             <includedLicense>CDDL 1.1</includedLicense>
                             <includedLicense>EPL 1.0</includedLicense>
+                            <includedLicense>GPL2 CPE</includedLicense>
                             <includedLicense>MIT</includedLicense>
                             <includedLicense>LGPL 2.1</includedLicense>
                             <includedLicense>LGPL 3.0</includedLicense>
@@ -94,10 +96,12 @@
                             <licenseMerge>CDDL 1.1|Common Development And Distribution License 1.1</licenseMerge>
                             <licenseMerge>EPL 1.0|Eclipse Public License 1.0</licenseMerge>
                             <licenseMerge>EPL 1.0|Eclipse Public License v1.0</licenseMerge>
+                            <licenseMerge>GPL2 CPE|GNU General Public License, version 2 (GPL2), with the classpath exception</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser General Public License</licenseMerge>
                             <licenseMerge>MIT|The MIT License</licenseMerge>
                             <licenseMerge>MIT|MIT License</licenseMerge>
+                            <licenseMerge>MIT|MIT license</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|GPL2 w/ CPE</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|GNU General Public License, Version 2 with the Classpath Exception</licenseMerge>

security/core/pom.xml

@@ -55,8 +55,8 @@
                     <groupId>com.google.inject</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>guice-multibindings</artifactId>
                     <groupId>com.google.inject.extensions</groupId>
+                    <artifactId>guice-multibindings</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

security/core/src/test/java/org/seedstack/seed/security/internal/SecurityInternalModuleUnitTest.java

@@ -48,6 +48,7 @@ public void before() {
         when(ab.toProvider(any(Provider.class))).thenReturn(sb);
         when(binder.bind(any(TypeLiteral.class))).thenReturn(ab);
         when(binder.skipSources(any(Class.class), any(Class.class))).thenReturn(binder);
+        when(binder.skipSources(any(Class.class))).thenReturn(binder);
         securityConfigurer = mock(SecurityConfigurer.class);
         underTest = new SecurityInternalModule(securityConfigurer, new HashMap<>());
         Whitebox.setInternalState(underTest, "binder", binder);

testing/arquillian/pom.xml

@@ -40,19 +40,13 @@
             <artifactId>arquillian-container-test-spi</artifactId>
             <version>${arquillian.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.seedstack.seed</groupId>
             <artifactId>seed-core</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>