Skip to content

Commit 7cac012

Browse files
authored
Use doclint -missing to handle Java 21 Javadoc errors instead of setting different Java versions in CI (#42112)
1 parent a43653d commit 7cac012

File tree

171 files changed

+193
-53
lines changed
  • eng/pipelines/templates
  • sdk
    • advisor/azure-resourcemanager-advisor
    • agrifood/azure-resourcemanager-agrifood
    • alertsmanagement/azure-resourcemanager-alertsmanagement
    • appconfiguration
      • azure-data-appconfiguration-perf/src/main/java/com/azure/data/appconfiguration/perf/core
      • azure-resourcemanager-appconfiguration
    • attestation/azure-resourcemanager-attestation
    • automanage/azure-resourcemanager-automanage
    • automation/azure-resourcemanager-automation
    • azureadexternalidentities/azure-resourcemanager-azureadexternalidentities
    • azurearcdata/azure-resourcemanager-azurearcdata
    • azurestack/azure-resourcemanager-azurestack
    • batchai/azure-resourcemanager-batchai
    • batch/azure-compute-batch
    • billingbenefits/azure-resourcemanager-billingbenefits
    • botservice/azure-resourcemanager-botservice
    • changeanalysis/azure-resourcemanager-changeanalysis
    • cognitiveservices/azure-resourcemanager-cognitiveservices
    • commerce/azure-resourcemanager-commerce
    • communication
    • consumption/azure-resourcemanager-consumption
    • core
    • cosmos
    • costmanagement/azure-resourcemanager-costmanagement
    • customerinsights/azure-resourcemanager-customerinsights
    • databoxedge/azure-resourcemanager-databoxedge
    • databox/azure-resourcemanager-databox
    • databricks/azure-resourcemanager-databricks
    • datalakeanalytics/azure-resourcemanager-datalakeanalytics
    • datalakestore/azure-resourcemanager-datalakestore
    • datamigration/azure-resourcemanager-datamigration
    • delegatednetwork/azure-resourcemanager-delegatednetwork
    • deploymentmanager/azure-resourcemanager-deploymentmanager
    • devhub/azure-resourcemanager-devhub
    • deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices
    • devspaces/azure-resourcemanager-devspaces
    • digitaltwins/azure-resourcemanager-digitaltwins
    • dnsresolver/azure-resourcemanager-dnsresolver
    • edgeorder/azure-resourcemanager-edgeorder
    • education/azure-resourcemanager-education
    • elastic/azure-resourcemanager-elastic
    • eventgrid
    • eventhubs
    • extendedlocation/azure-resourcemanager-extendedlocation
    • face/azure-ai-vision-face
    • fluidrelay/azure-resourcemanager-fluidrelay
    • formrecognizer
    • graphservices/azure-resourcemanager-graphservices
    • hanaonazure/azure-resourcemanager-hanaonazure
    • healthbot/azure-resourcemanager-healthbot
    • hybridkubernetes/azure-resourcemanager-hybridkubernetes
    • identity/azure-identity-broker
    • iotcentral/azure-resourcemanager-iotcentral
    • keyvault
      • azure-security-keyvault-administration
      • azure-security-keyvault-certificates
      • azure-security-keyvault-jca
      • azure-security-keyvault-secrets
      • azure-security-test-keyvault-jca
    • labservices/azure-resourcemanager-labservices
    • loadtesting/azure-resourcemanager-loadtesting
    • logic/azure-resourcemanager-logic
    • logz/azure-resourcemanager-logz
    • machinelearningservices/azure-resourcemanager-machinelearningservices
    • managednetworkfabric/azure-resourcemanager-managednetworkfabric
    • managementgroups/azure-resourcemanager-managementgroups
    • mariadb/azure-resourcemanager-mariadb
    • marketplaceordering/azure-resourcemanager-marketplaceordering
    • mediaservices/azure-resourcemanager-mediaservices
    • metricsadvisor
    • mixedreality/azure-resourcemanager-mixedreality
    • mysql/azure-resourcemanager-mysql
    • networkfunction/azure-resourcemanager-networkfunction
    • oep/azure-resourcemanager-oep
    • operationsmanagement/azure-resourcemanager-operationsmanagement
    • orbital/azure-resourcemanager-orbital
    • parents
    • peering/azure-resourcemanager-peering
    • personalizer/azure-ai-personalizer
    • policyinsights/azure-resourcemanager-policyinsights
    • postgresql/azure-resourcemanager-postgresql
    • powerbidedicated/azure-resourcemanager-powerbidedicated
    • providerhub/azure-resourcemanager-providerhub
    • purview/azure-resourcemanager-purview
    • quantum/azure-quantum-jobs
    • relay/azure-resourcemanager-relay
    • reservations/azure-resourcemanager-reservations
    • resourcegraph/azure-resourcemanager-resourcegraph
    • resourcemanager
      • azure-resourcemanager-appplatform
      • azure-resourcemanager-appservice
      • azure-resourcemanager-authorization
      • azure-resourcemanager-cdn
      • azure-resourcemanager-compute
      • azure-resourcemanager-containerinstance
      • azure-resourcemanager-containerregistry
      • azure-resourcemanager-containerservice
      • azure-resourcemanager-cosmos
      • azure-resourcemanager-dns
      • azure-resourcemanager-eventhubs
      • azure-resourcemanager-keyvault
      • azure-resourcemanager-monitor
      • azure-resourcemanager-msi
      • azure-resourcemanager-network
      • azure-resourcemanager-privatedns
      • azure-resourcemanager-redis
      • azure-resourcemanager-resources
      • azure-resourcemanager-servicebus
      • azure-resourcemanager-sql
      • azure-resourcemanager-storage
      • azure-resourcemanager-trafficmanager
      • azure-resourcemanager
    • schemaregistry/azure-data-schemaregistry-jsonschema
    • search
    • securitydevops/azure-resourcemanager-securitydevops
    • securityinsights/azure-resourcemanager-securityinsights
    • serialization
    • servicebus/azure-messaging-servicebus-stress
    • servicelinker/azure-resourcemanager-servicelinker
    • spring
    • sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine
    • storageimportexport/azure-resourcemanager-storageimportexport
    • storagepool/azure-resourcemanager-storagepool
    • storage
    • subscription/azure-resourcemanager-subscription
    • synapse/azure-resourcemanager-synapse
    • tables
    • template
      • azure-sdk-template-three/src/main/java/com/azure/sdk/template/three
      • azure-sdk-template-two/src/main/java/com/azure/sdk/template/two
      • azure-sdk-template/src/main/java/com/azure/sdk/template
    • textanalytics
    • timeseriesinsights/azure-resourcemanager-timeseriesinsights
    • videoanalyzer
      • azure-media-videoanalyzer-edge
      • azure-resourcemanager-videoanalyzer
    • vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple
    • voiceservices/azure-resourcemanager-voiceservices
    • webpubsub/azure-messaging-webpubsub
    • workloads/azure-resourcemanager-workloads

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+193
-53
lines changed

eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ jobs:
136136
- template: /eng/pipelines/templates/steps/run-and-validate-linting.yml
137137
parameters:
138138
JavaBuildVersion: $(JavaTestVersion)
139-
JavadocSafeJavaBuildVersion: $(JavadocSafeJavaBuildVersion)
140139
AdditionalLintingOptions: ${{ parameters.AdditionalLintingOptions }}
141140
BuildParallelization: ${{ parameters.BuildParallelization }}
142141
ContinueOnError: true

eng/pipelines/templates/jobs/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ parameters:
4949
- name: JavaBuildVersion
5050
type: string
5151
default: $(JavaBuildVersion)
52-
- name: JavadocSafeJavaBuildVersion
53-
type: string
54-
default: $(JavadocSafeJavaBuildVersion)
5552
- name: IgnoreVerifyTypeSpecCodeGenerationError
5653
type: boolean
5754
default: false
@@ -163,14 +160,14 @@ jobs:
163160
displayName: 'pip install markdown2 and BeautifulSoup4'
164161
165162
- task: Maven@4
166-
displayName: 'Build and Package, JDK Version: ${{ parameters.JavadocSafeJavaBuildVersion }}'
163+
displayName: 'Build and Package, JDK Version: ${{ parameters.JavaBuildVersion }}'
167164
inputs:
168165
mavenPomFile: pom.xml
169166
goals: 'deploy'
170167
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -Dspotless.apply.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
171168
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
172169
javaHomeOption: 'JDKVersion'
173-
jdkVersionOption: ${{ parameters.JavadocSafeJavaBuildVersion }} # TODO (vcolin7): Change to ${{ parameters.JavaBuildVersion }} once Javadoc migration to Java 21 is complete.
170+
jdkVersionOption: ${{ parameters.JavaBuildVersion }}
174171
jdkArchitectureOption: 'x64'
175172
publishJUnitResults: false
176173

@@ -368,7 +365,6 @@ jobs:
368365
- template: /eng/pipelines/templates/steps/run-and-validate-linting.yml
369366
parameters:
370367
JavaBuildVersion: ${{ parameters.JavaBuildVersion }}
371-
JavadocSafeJavaBuildVersion: ${{ parameters.JavadocSafeJavaBuildVersion }}
372368
AdditionalLintingOptions: ${{ parameters.AdditionalLintingOptions }}
373369
BuildParallelization: ${{ parameters.BuildParallelization }}
374370
RunLinting: true

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ parameters:
1717
- name: JavaBuildVersion
1818
type: string
1919
default: $(JavaBuildVersion)
20-
- name: JavadocSafeJavaBuildVersion
21-
type: string
22-
default: $(JavadocSafeJavaBuildVersion)
2320
- name: TestPipeline
2421
type: boolean
2522
default: false
@@ -126,14 +123,14 @@ extends:
126123
JdkVersion: ${{ parameters.JavaBuildVersion }}
127124

128125
- task: Maven@4
129-
displayName: 'Build From Source and Package, JDK Version: ${{ parameters.JavadocSafeJavaBuildVersion }}'
126+
displayName: 'Build From Source and Package, JDK Version: ${{ parameters.JavaBuildVersion }}'
130127
inputs:
131128
mavenPomFile: ClientFromSourcePom.xml
132129
goals: 'deploy'
133130
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -Dspotless.apply.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module, so we ensure it always builds in CI.
134131
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
135132
javaHomeOption: 'JDKVersion'
136-
jdkVersionOption: ${{ parameters.JavadocSafeJavaBuildVersion }}
133+
jdkVersionOption: ${{ parameters.JavaBuildVersion }}
137134
jdkArchitectureOption: 'x64'
138135
publishJUnitResults: false
139136

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ parameters:
4646
- name: JavaBuildVersion
4747
type: string
4848
default: $(JavaBuildVersion)
49-
- name: JavadocSafeJavaBuildVersion
50-
type: string
51-
default: $(JavadocSafeJavaBuildVersion)
5249
- name: LiveTestStages
5350
type: stageList
5451
default: []

eng/pipelines/templates/steps/run-and-validate-linting.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: JavaBuildVersion
33
type: string
44
default: $(JavaBuildVersion)
5-
- name: JavadocSafeJavaBuildVersion
6-
type: string
7-
default: $(JavadocSafeJavaBuildVersion)
85
- name: AdditionalLintingOptions
96
type: string
107
default: ''
@@ -87,7 +84,7 @@ steps:
8784
options: '$(DefaultOptions) --no-transfer-progress ${{ parameters.AdditionalLintingOptions }} -pl $(ProjectList)'
8885
mavenOptions: '$(MemoryOptions)'
8986
javaHomeOption: 'JDKVersion'
90-
jdkVersionOption: ${{ parameters.JavadocSafeJavaBuildVersion }} # TODO (vcolin7): Change to ${{ parameters.JavaBuildVersion }} once Javadoc migration to Java 21 is complete. See: https://github.com/Azure/azure-sdk-for-java/issues/38267.
87+
jdkVersionOption: ${{ parameters.JavaBuildVersion }}
9188
jdkArchitectureOption: 'x64'
9289
publishJUnitResults: false
9390
${{ if ne(parameters.SDKType, 'client') }}:

eng/pipelines/templates/variables/globals.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ variables:
22
DocWardenVersion: '0.7.2'
33
# This is the default Java build version. It's the version used to build the shipping libraries, Spotbugs etc.
44
JavaBuildVersion: '1.21'
5-
# This is the highest Java version we can write all our Javadocs with. Libraries that support a higher version can override this value in their CI templates.
6-
JavadocSafeJavaBuildVersion: '1.17' # TODO (vcolin7): Remove and use JavaBuildVersion in templates once Javadoc migration to Java 21 is complete. See: https://github.com/Azure/azure-sdk-for-java/issues/38267.
75
# This is the highest LTS Java version we use to build the Cosmos Spark connectors and libraries baselined on Java 7.
86
FallbackJavaBuildVersion: '1.17'
97
# This is the default Java test version. It's the version used when running tests.

sdk/advisor/azure-resourcemanager-advisor/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<jacoco.skip>true</jacoco.skip>
42+
<doclintMissingInclusion>-</doclintMissingInclusion>
4243
</properties>
4344
<dependencies>
4445
<dependency>

sdk/agrifood/azure-resourcemanager-agrifood/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<jacoco.skip>true</jacoco.skip>
42+
<doclintMissingInclusion>-</doclintMissingInclusion>
4243
</properties>
4344
<dependencies>
4445
<dependency>

sdk/alertsmanagement/azure-resourcemanager-alertsmanagement/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<jacoco.skip>true</jacoco.skip>
42+
<doclintMissingInclusion>-</doclintMissingInclusion>
4243
</properties>
4344
<dependencies>
4445
<dependency>

sdk/appconfiguration/azure-data-appconfiguration-perf/src/main/java/com/azure/data/appconfiguration/perf/core/ServiceTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,27 @@
1313

1414
/**
1515
* Base class for Azure App Configuration performance tests.
16+
*
17+
* @param <TOptions> The type of stress options.
1618
*/
1719
public abstract class ServiceTest<TOptions extends PerfStressOptions> extends PerfStressTest<TOptions> {
1820
private static final String CONFIGURATION_ERROR
1921
= "Configuration %s must be set in either environment variables " + "or system properties.%n";
2022

23+
/**
24+
* The synchronous configuration client.
25+
*/
2126
protected final ConfigurationClient configurationClient;
27+
28+
/**
29+
* The asynchronous configuration client.
30+
*/
2231
protected final ConfigurationAsyncClient configurationAsyncClient;
2332

2433
/**
2534
* The base class for Azure App Configuration tests.
2635
*
2736
* @param options the configurable options for performing perf testing on this class.
28-
*
2937
* @throws RuntimeException if "AZURE_APPCONFIG_CONNECTION_STRING" is null or empty.
3038
*/
3139
public ServiceTest(TOptions options) {

0 commit comments

Comments
 (0)