Merge pull request #1465 from spencergibb/jakartaee-upgrade

Upgrade eureka to be compatible with jakartaee

.github/workflows/nebula-ci.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # test against JDK 8
-        java: [ 8 ]
+        # test against JDK 11
+        java: [ 11 ]
     name: CI with Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v1

.github/workflows/nebula-publish.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Setup jdk 8
+      - name: Setup jdk 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/cache@v1
         id: gradle-cache
         with:

.github/workflows/nebula-snapshot.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 11
       - uses: actions/cache@v2
         id: gradle-cache
         with:

build.gradle

@@ -35,24 +35,21 @@ allprojects {
         githubProjectName = 'eureka'
 
         awsVersion = '1.11.277'
-        servletVersion = '2.5'
-        jerseyVersion = '1.19.1'
+        servletVersion = '5.0.0'
         jettisonVersion = '1.4.0'
         apacheHttpClientVersion = '4.5.3'
         commonsConfigurationVersion = '1.10'
         jsr305Version = '3.0.2'
-        guiceVersion = '4.1.0'
         servoVersion = '0.12.21'
-        governatorVersion = '1.17.5'
         archaiusVersion = '0.7.6'
         jacksonVersion = '2.10.5'
         jacksonDatabindVersion = '2.10.5.1'
         woodstoxVersion = '5.2.1'
 
         // test deps
-        jetty_version = '7.2.0.v20101020'
+        jetty_version = '11.0.11'
         junit_version = '4.11'
-        mockitoVersion = '1.10.19'
+        mockitoVersion = '4.6.1'
         mockserverVersion = '3.9.2'
     }
 }

eureka-client-archaius2/build.gradle

@@ -21,6 +21,4 @@ dependencies {
     testCompile 'org.mortbay.jetty:jetty:6.1H.22'
     testCompile "org.mockito:mockito-core:${mockitoVersion}"
     testCompile "org.mock-server:mockserver-netty:${mockserverVersion}"
-    testCompile "com.netflix.archaius:archaius2-guice:${archaius2Version}"
-    testCompile "com.netflix.governator:governator:${governatorVersion}"
 }

eureka-client-archaius2/src/main/java/com/netflix/appinfo/Archaius2AmazonInfoConfig.java

@@ -5,8 +5,8 @@
 import com.netflix.discovery.CommonConstants;
 import com.netflix.discovery.internal.util.InternalPrefixedConfig;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import static com.netflix.appinfo.PropertyBasedAmazonInfoConfigConstants.*;
 

eureka-client-archaius2/src/main/java/com/netflix/appinfo/Ec2EurekaArchaius2InstanceConfig.java

@@ -1,8 +1,8 @@
 package com.netflix.appinfo;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 import com.netflix.discovery.CommonConstants;
 import org.slf4j.Logger;

eureka-client-archaius2/src/main/java/com/netflix/appinfo/EurekaArchaius2InstanceConfig.java

@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.google.common.collect.Sets;
 import com.netflix.archaius.api.Config;

eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/AmazonInfoProviderFactory.java

@@ -2,7 +2,7 @@
 
 import com.netflix.appinfo.AmazonInfo;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public interface AmazonInfoProviderFactory {
     Provider<AmazonInfo> get();

eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/Archaius2VipAddressResolver.java

@@ -4,8 +4,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CompositeInstanceConfigFactory.java

@@ -15,8 +15,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 

eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java

@@ -7,10 +7,10 @@
 import com.netflix.discovery.CommonConstants;
 import com.netflix.discovery.DiscoveryManager;
 
-import com.google.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class CustomAmazonInfoProviderInstanceConfigFactory implements EurekaInstanceConfigFactory {
@@ -19,7 +19,7 @@ public class CustomAmazonInfoProviderInstanceConfigFactory implements EurekaInst
     private final Provider<AmazonInfo> amazonInfoProvider;
     private EurekaInstanceConfig eurekaInstanceConfig;
 
-    @Inject(optional = true)
+    @Inject
     @Named(CommonConstants.INSTANCE_CONFIG_NAMESPACE_KEY)
     String instanceConfigNamespace;
 

eureka-client-archaius2/src/main/java/com/netflix/discovery/EurekaArchaius2ClientConfig.java

@@ -4,14 +4,14 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.google.inject.Inject;
+import jakarta.inject.Inject;
 import com.netflix.appinfo.EurekaAccept;
 import com.netflix.archaius.api.Config;
 import com.netflix.archaius.api.annotations.ConfigurationSource;
 import com.netflix.discovery.internal.util.InternalPrefixedConfig;
 import com.netflix.discovery.shared.transport.EurekaTransportConfig;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import static com.netflix.discovery.PropertyBasedClientConfigConstants.*;
 

eureka-client-archaius2/src/main/java/com/netflix/discovery/shared/transport/EurekaArchaius2TransportConfig.java

@@ -1,12 +1,12 @@
 package com.netflix.discovery.shared.transport;
 
-import com.google.inject.Inject;
+import jakarta.inject.Inject;
 import com.netflix.archaius.api.Config;
 import com.netflix.archaius.api.annotations.ConfigurationSource;
 import com.netflix.discovery.CommonConstants;
 import com.netflix.discovery.internal.util.InternalPrefixedConfig;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import static com.netflix.discovery.shared.transport.PropertyBasedTransportConfigConstants.*;