Use Java 17 as the LTS Version

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -92,27 +92,15 @@
           "class com\\.azure\\.spring\\.cloud\\.config\\.web\\.AppConfigurationEndpoint",
           {
             "matcher": "java-package",
-            "match": "/org\\.apache\\.avro(\\..*)?/"
+            "match": "/org\\.apache\\.(avro|commons|qpid)(\\..*)?/"
           },
           {
             "matcher": "java-package",
             "match": "/com\\.azure\\.resourcemanager(\\..+?)?\\.fluent(\\..*)?/"
           },
           {
             "matcher": "java-package",
-            "match": "/org\\.junit(\\..*)?/"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/org.apache.commons(..*)?/"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/org.slf4j(..*)?/"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/org.springframework(..*)?/"
+            "match": "/org\\.(junit|slf4j|springframework)(\\..*)?/"
           }
         ]
       }
@@ -249,6 +237,21 @@
           "superClass": "com.azure.core.models.MessageContent",
           "justification": "To support Schema Registry Avro Serializer's signature, EventData extends from MessageContent."
         },
+        {
+          "code": "java.method.visibilityReduced",
+          "new": "method com.azure.spring.cloud.autoconfigure.context.AzureTokenCredentialAutoConfiguration.AzureServiceClientBuilderFactoryPostProcessor com.azure.spring.cloud.autoconfigure.context.AzureTokenCredentialAutoConfiguration::builderFactoryBeanPostProcessor()",
+          "justification": "Shouldn't have been a public API and was recently released."
+        },
+        {
+          "code": "java.method.visibilityReduced",
+          "new": "method com.azure.spring.cloud.autoconfigure.jms.AzureServiceBusJmsPropertiesBeanPostProcessor com.azure.spring.cloud.autoconfigure.jms.ServiceBusJmsAutoConfiguration::azureServiceBusJmsPropertiesBeanPostProcessor(org.springframework.beans.factory.ObjectProvider<com.azure.spring.cloud.core.provider.connectionstring.ServiceConnectionStringProvider<com.azure.spring.cloud.core.service.AzureServiceType.ServiceBus>>)",
+          "justification": "Shouldn't have been a public API and was recently released."
+        },
+        {
+          "code": "java.annotation.added",
+          "new": "class com.azure.spring.cloud.autoconfigure.context.AzureTokenCredentialAutoConfiguration",
+          "justification": "Fixes a bug."
+        },
         {
           "code": "java.missing.newSuperType",
           "old": "class com.azure.messaging.eventhubs.EventData",

eng/pipelines/templates/jobs/ci.yml

@@ -52,6 +52,9 @@ parameters:
   - name: TestParallelization
     type: string
     default: '1C'
+  - name: JavaBuildVersion
+    type: string
+    default: $(JavaBuildVersion)
 
 jobs:
   - job: 'Build'
@@ -172,14 +175,14 @@ jobs:
         displayName: 'pip install markdown2 and BeautifulSoup4'
 
       - task: Maven@3
-        displayName: 'Build and Package, JDK Version: $(JavaBuildVersion)'
+        displayName: 'Build and Package, JDK Version: ${{ parameters.JavaBuildVersion }}'
         inputs:
           mavenPomFile: pom.xml
           goals: 'deploy'
           options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
-          jdkVersionOption: $(JavaBuildVersion)
+          jdkVersionOption: ${{ parameters.JavaBuildVersion }}
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
@@ -340,6 +343,8 @@ jobs:
       # We `install` the code quality reports tooling into our local m2 cache separately from building the Maven project
       # reports. This means it is available as part of that, but also so that this is not documented in the project report.
       - template: ../steps/install-reporting-tools.yml
+        parameters:
+          JdkVersion: ${{ parameters.JavaBuildVersion }}
 
       # maven dependency:tree needs to be able to resolve dependencies, so these should be installed.
       - task: Maven@3
@@ -350,7 +355,7 @@ jobs:
           options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} -DskipTests $(DefaultSkipOptions) -pl $(ProjectList) -am'
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
-          jdkVersionOption: $(JavaBuildVersion)
+          jdkVersionOption: ${{ parameters.JavaBuildVersion }}
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
@@ -361,7 +366,7 @@ jobs:
           options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -DskipCompile=true -DskipTestCompile=true ${{ parameters.AdditionalLintingOptions }} -pl $(ProjectList)'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
-          jdkVersionOption: $(JavaBuildVersion)
+          jdkVersionOption: ${{ parameters.JavaBuildVersion }}
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
           goals: 'verify'

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -56,6 +56,9 @@ parameters:
 - name: EnableBatchRelease
   type: boolean
   default: false
+- name: JavaBuildVersion
+  type: string
+  default: $(JavaBuildVersion)
 
 stages:
   - stage: Build
@@ -84,11 +87,16 @@ stages:
             - ${{ replacement }}
 
           - AZURE_TEST.*=.*/
+          - ${{ if eq(parameters.SDKType, 'data') }}:
+            - JavaTestVersion=(.*1)\.17(.*)/$1.11$2
         PreBuildSteps: ${{ parameters.PreBuildSteps }}
         AdditionalLintingOptions: ${{ parameters.AdditionalLintingOptions }}
         ${{ if eq(parameters.SDKType, 'data') }}:
           TestGoals: 'verify'
           TestOptions: '-am'
+          JavaBuildVersion: '1.11'
+        ${{ else }}:
+          JavaBuildVersion: ${{ parameters.JavaBuildVersion }}
 
   - ${{ parameters.AdditionalStagesAfterBuild }}
 

eng/pipelines/templates/stages/archetype-sdk-tests.yml

@@ -104,6 +104,9 @@ parameters:
 - name: AdditionalBuildOptions
   type: string
   default: $(AdditionalBuildOptions)
+- name: LtsVersion
+  type: string
+  default: $(JavaTestVersion)
 
 stages:
 - ${{ each cloud in parameters.CloudConfig }}:

eng/pipelines/templates/stages/cosmos-sdk-client.yml

@@ -41,6 +41,7 @@ stages:
           - TestFromSource=^$|false
         MatrixReplace:
           - AZURE_TEST.*=.*/
+          - JavaTestVersion=(.*1)\.17(.*)/$1.11$2
         BuildParallelization: 1
         AdditionalBuildOptions: '-DsparkShading'
         TestOptions: '-Punit'
@@ -57,6 +58,8 @@ stages:
             Path: eng/pipelines/templates/stages/cosmos-emulator-matrix.json
             Selection: all
             GenerateVMJobs: true
+        MatrixReplace:
+          - JavaTestVersion=(.*1)\.17(.*)/$1.11$2
         AdditionalParameters:
           BuildParallelization: 1
           AdditionalBuildOptions: '-DsparkShading'

eng/pipelines/templates/stages/platform-matrix.json

@@ -8,7 +8,7 @@
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
       "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
     },
-    "JavaTestVersion": [ "1.8", "1.11" ],
+    "JavaTestVersion": [ "1.8", "1.17" ],
     "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ],
     "TestFromSource": false,
     "TestGoals": "surefire:test",
@@ -17,15 +17,15 @@
   "exclude": [
     {
       "Pool": "azsdk-pool-mms-win-2019-general",
-      "JavaTestVersion": "1.11"
+      "JavaTestVersion": "1.17"
     }
   ],
   "include": [
     {
       "Agent": {
           "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       },
-      "JavaTestVersion": "1.11",
+      "JavaTestVersion": "1.17",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": true,
       "TestGoals": "verify",
@@ -35,11 +35,21 @@
       "Agent": {
         "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
       },
-      "JavaTestVersion": "1.11",
+      "JavaTestVersion": "1.17",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "TestGoals": "verify",
       "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false"
+    },
+    {
+      "Agent": {
+        "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
+      },
+      "JavaTestVersion": "1.11",
+      "AZURE_TEST_HTTP_CLIENTS": "netty",
+      "TestFromSource": false,
+      "TestGoals": "surefire:test",
+      "TestOptions": ""
     }
   ]
 }

eng/pipelines/templates/variables/globals.yml

@@ -1,9 +1,9 @@
 variables:
   DocWardenVersion: '0.7.1'
   # This is the default Java build version. It's the version used to build the shipping libraries, Spotbugs etc.
-  JavaBuildVersion: '1.11'
+  JavaBuildVersion: '1.17'
   # This is the default Java test version. It's the version used when running tests.
-  JavaTestVersion: '1.11'
+  JavaTestVersion: '1.17'
 
   # True if 'Enable system diagnostics' is checked when running a pipeline manually
   IsDebug: $[coalesce(variables['System.Debug'], 'false')]

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/config/web/AppConfigurationWebConstants.java

@@ -25,7 +25,7 @@ public final class AppConfigurationWebConstants {
      * Json field name for SyncToken value
      */
     public static final String SYNC_TOKEN = "syncToken";
-    
+
     /**
      * Prefix of the validation code.
      */

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/AppConfigurationCredentialProvider.java

@@ -5,7 +5,8 @@
 import com.azure.core.credential.TokenCredential;
 
 /**
- * Interface to be implemented that enables returning of a TokenCredential for authentication with an Azure App Configuration stores.
+ * Interface to be implemented that enables returning of a TokenCredential for authentication with an Azure App
+ * Configuration stores.
  */
 public interface AppConfigurationCredentialProvider {
 

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/AppConfigurationPropertySourceLocator.java

@@ -57,7 +57,7 @@ public final class AppConfigurationPropertySourceLocator implements PropertySour
 
     private static final AtomicBoolean configloaded = new AtomicBoolean(false);
 
-    private static final AtomicBoolean startup = new AtomicBoolean(true);
+    static final AtomicBoolean startup = new AtomicBoolean(true);
 
     /**
      * Loads all Azure App Configuration Property Sources configured.
@@ -95,7 +95,7 @@ public PropertySource<?> locate(Environment environment) {
         List<String> profiles = Arrays.asList(env.getActiveProfiles());
 
         CompositePropertySource composite = new CompositePropertySource(PROPERTY_SOURCE_NAME);
-        Collections.reverse(configStores); // Last store has highest precedence
+        Collections.reverse(configStores); // Last store has the highest precedence
 
         Iterator<ConfigStore> configStoreIterator = configStores.iterator();
         // Feature Management needs to be set in the last config store.
@@ -131,9 +131,7 @@ public PropertySource<?> locate(Environment environment) {
      *
      * @param composite PropertySource being added
      * @param store Config Store the PropertySource is being generated from
-     * @param applicationName Name of the application
      * @param profiles Active profiles in the Store
-     * @param storeContextsMap the Map storing the storeName -> List of contexts map
      * @param initFeatures determines if Feature Management is set in the PropertySource. When generating more than one
      * it needs to be in the last one.
      */
@@ -182,11 +180,9 @@ private void addPropertySource(CompositePropertySource composite, ConfigStore st
     }
 
     /**
-     * Creates a new set of AppConfigurationProertySources, 1 per Label.
+     * Creates a new set of AppConfigurationPropertySources, 1 per Label.
      *
-     * @param context Context of the application, part of uniquely define a PropertySource
      * @param store Config Store the PropertySource is being generated from
-     * @param storeContextsMap the Map storing the storeName -> List of contexts map
      * @param initFeatures determines if Feature Management is set in the PropertySource. When generating more than one
      * it needs to be in the last one.
      * @return a list of AppConfigurationPropertySources

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/AppConfigurationRefresh.java

@@ -33,7 +33,6 @@
 
 /**
  * Enables checking of Configuration updates.
- *
  */
 @Component
 public class AppConfigurationRefresh implements ApplicationEventPublisherAware {
@@ -58,7 +57,7 @@ public class AppConfigurationRefresh implements ApplicationEventPublisherAware {
 
     /**
      * Component used for checking for and triggering configuration refreshes.
-     * 
+     *
      * @param properties Client properties to check against.
      * @param appProperties Library properties for configuring backoff
      * @param clientStore Clients stores used to connect to App Configuration.
@@ -304,7 +303,7 @@ private boolean refreshFeatureFlags(ConfigStore configStore, State state, String
 
     /**
      * Gets latest Health connection info for refresh.
-     * 
+     *
      * @return Map of String, endpoint, and Health information.
      */
     public Map<String, AppConfigurationStoreHealth> getAppConfigurationStoresHealth() {

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/StateHolder.java

@@ -121,7 +121,7 @@ public static Instant getNextForcedRefresh() {
 
     /**
      * Set after load or refresh is successful.
-     * @param nextForcedRefresh the nextForcedRefresh to set
+     * @param refreshPeriod the refreshPeriod to set
      */
     public static void setNextForcedRefresh(Duration refreshPeriod) {
         nextForcedRefresh = Instant.now().plusSeconds(refreshPeriod.getSeconds());
@@ -130,7 +130,7 @@ public static void setNextForcedRefresh(Duration refreshPeriod) {
     /**
      * Sets a minimum value until the next refresh. If a refresh interval has passed or is smaller than the calculated
      * backoff time, the refresh interval is set to the backoff time.
-     * @param refreshInterval period between refreshe checks.
+     * @param refreshInterval period between refresh checks.
      * @param properties Provider properties for min and max backoff periods.
      */
     static void updateNextRefreshTime(Duration refreshInterval, AppConfigurationProviderProperties properties) {
@@ -156,7 +156,7 @@ static void updateNextRefreshTime(Duration refreshInterval, AppConfigurationProv
             STATE.put(entry.getKey(), updatedState);
         }
     }
-    
+
     /**
      * Calculates the amount of time to the next refresh, if a refresh fails. Takes current Refresh date into account
      * for watch keys. Used for checking client refresh-interval only.

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/properties/AppConfigurationProperties.java

@@ -28,7 +28,7 @@
 public final class AppConfigurationProperties {
 
     /**
-     * Prefix for client configurations for connecting to stores.
+     * Prefix for client configurations for connecting to configuration stores.
      */
     public static final String CONFIG_PREFIX = "spring.cloud.azure.appconfiguration";
 
@@ -98,7 +98,7 @@ public String getDefaultContext() {
     }
 
     /**
-     * Overrides the default context of `applicaiton`.
+     * Overrides the default context of `application`.
      * @deprecated Use spring.cloud.azure.appconfiguration[0].selects
      * @param defaultContext Key Prefix.
      */
@@ -121,7 +121,7 @@ public String getName() {
     /**
      * Used to override the spring.application.name value
      * @deprecated Use spring.cloud.azure.appconfiguration[0].selects
-     * @param name application name in conifg key.
+     * @param name application name in config key.
      */
     @Deprecated
     public void setName(@Nullable String name) {