Upgrade Jersey, Javassist and Coffig

Author: adrienlauer

CHANGELOG.md

@@ -1,11 +1,14 @@
-# Version 3.12.0 (2021-01-31)
+# Version 3.12.0 (2021-05-06)
 
 * [new] Java 15 support
 * [new] The `check` tool analyzes and show discrepancies between configuration files (actual config) and configuration objects (expected config).
 * [chg] Move main entrypoint logic from `SeedMain.main()` to `Seed.launch()`, allowing custom main methods in addition to the built-in `SeedMain`. 
 * [chg] Upgrade Shiro to 1.7.1 (fixes CVE-2020-11989, CVE-2020-17510, CVE-2020-1957, CVE-2020-13933 and CVE-2019-12422).
 * [chg] Upgrade Guice to 5.0.1
-* [chg] Update pom parent to 4.0.0 (deploy/release directly to Sonatype).
+* [chg] Upgrade Jersey to 2.34
+* [chg] Upgrade Javassist to 3.27.0-GA
+* [chg] Upgrade Guava to 30.1.1-jre
+* [chg] Upgrade Coffig to 3.1.7
 * [fix] Detection of color output under recent versions of IntelliJ.
 * [fix] Fix configuration evaluation (macros, functions, ...) in `classes` section (see https://github.com/seedstack/seed/issues/283).
 

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1</version>
     </parent>
 
     <groupId>org.seedstack.seed</groupId>
@@ -24,22 +24,21 @@
 
     <properties>
         <nuun-kernel.version>1.0.M11</nuun-kernel.version>
-        <javassist.version>3.24.1-GA</javassist.version>
+        <javassist.version>3.27.0-GA</javassist.version>
         <shed.version>1.1.6</shed.version>
-        <coffig.version>3.1.7-SNAPSHOT</coffig.version>
+        <coffig.version>3.1.7</coffig.version>
         <commons-cli.version>1.4</commons-cli.version>
         <guice.version>5.0.1</guice.version>
         <guava.version>30.1.1-jre</guava.version>
         <typetools.version>0.5.0</typetools.version>
         <shiro.version>1.7.1</shiro.version>
         <undertow.version>2.1.3.Final</undertow.version>
-        <jersey2.version>2.31</jersey2.version>
+        <jersey2.version>2.34</jersey2.version>
         <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
         <aopalliance.version>1.0</aopalliance.version>
         <glassfish-javax.el.version>3.0.0</glassfish-javax.el.version>
         <arquillian.version>1.4.0.Final</arquillian.version>
         <tomcat.version>7.0.86</tomcat.version>
-        <kubernetes-annotations.version>1.0.3</kubernetes-annotations.version>
 
         <compatibility.version>3.1.0</compatibility.version>
 

rest/jersey2/src/test/java/org/seedstack/seed/rest/jersey2/internal/GuiceComponentProviderTest.java

@@ -7,32 +7,28 @@
  */
 package org.seedstack.seed.rest.jersey2.internal;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
 import com.google.common.collect.Sets;
 import com.google.inject.Injector;
 import io.nuun.kernel.api.annotations.Ignore;
-import javax.servlet.ServletContext;
-import javax.ws.rs.Path;
-import javax.ws.rs.ext.Provider;
-import mockit.Deencapsulation;
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-import mockit.Tested;
-import mockit.Verifications;
+import mockit.*;
 import org.glassfish.hk2.api.DynamicConfiguration;
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.binding.BindingBuilder;
 import org.glassfish.hk2.utilities.binding.ServiceBindingBuilder;
+import org.glassfish.jersey.model.ContractProvider;
 import org.junit.Test;
 import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
 import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
 import org.seedstack.seed.SeedException;
 
+import javax.servlet.ServletContext;
+import javax.ws.rs.Path;
+import javax.ws.rs.ext.Provider;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
 public class GuiceComponentProviderTest {
     @Tested
     private GuiceComponentProvider underTest;
@@ -135,7 +131,7 @@ public void testPrepareHK2Bridge(@Mocked final GuiceBridge guiceBridge) {
 
     @Test
     public void testDoNotBindNonResourceClasses() {
-        boolean isBound = underTest.bind(String.class, null);
+        boolean isBound = underTest.bind(String.class, (ContractProvider) null);
         assertThat(isBound).isFalse();
     }
 
@@ -150,7 +146,7 @@ public <T> void testBindResourceClasses(@Mocked ServiceBindingBuilder<T> binding
         class MyResource {
         }
 
-        assertThat(underTest.bind(MyResource.class, null)).isTrue();
+        assertThat(underTest.bind(MyResource.class, (ContractProvider) null)).isTrue();
     }
 
     @Test