Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change clientcore's baseline to Java 17 #43152

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@
"sdk/clientcore/core/**",
"sdk/clientcore/core-json/**",
"sdk/clientcore/http-okhttp3/**",
"sdk/clientcore/http-jdk-httpclient/**",
"sdk/serialization/azure-json-gson/**",
"sdk/serialization/azure-json/**",
"sdk/serialization/azure-xml/**",
Expand Down
2 changes: 2 additions & 0 deletions common/perf-test-core/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@
requires io.netty.codec.http;
requires okhttp3;
requires io.vertx.core;

exports com.azure.perf.test.core;
}
1 change: 0 additions & 1 deletion eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ known_content_issues:
- ['sdk/parents/azure-code-customization-parent/README.md', '#3113']
- ['sdk/parents/azure-perf-test-parent/README.md', '#3113']
- ['sdk/parents/clientcore-parent/README.md', '#3113']
- ['sdk/clientcore/http-jdk-httpclient/README.md', '#3113']
- ['sdk/search/azure-search-documents/src/test/README.md', '#3113']
- ['sdk/search/open-api/readme.md', '#3113']
- ['sdk/search/README.md', '#3113']
Expand Down
1 change: 0 additions & 1 deletion eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ com.azure.tools:azure-sdk-build-tool;1.0.0;1.1.0-beta.1
io.clientcore:clientcore-parent;1.0.0-beta.1;1.0.0-beta.1
io.clientcore:core;1.0.0-beta.1;1.0.0-beta.1
io.clientcore:core-json;1.0.0-beta.1;1.0.0-beta.1
io.clientcore:http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
io.clientcore:http-okhttp3;1.0.0-beta.1;1.0.0-beta.1
io.clientcore:http-stress;1.0.0-beta.1;1.0.0-beta.1

Expand Down
14 changes: 6 additions & 8 deletions sdk/clientcore/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ parameters:
displayName: 'core'
type: boolean
default: true
- name: release_clientcorehttpjdkhttpclient
displayName: 'http-jdk-httpclient'
type: boolean
default: false
- name: release_clientcorehttpokhttp3
displayName: 'http-okhttp3'
type: boolean
Expand All @@ -43,15 +39,17 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: clientcore
MatrixConfigs:
- Name: clientcore_ci_test_base
Path: sdk/clientcore/platform-matrix.json
Selection: sparse
NonSparseParameters: Agent
GenerateVMJobs: true
Artifacts:
- name: core
groupId: io.clientcore
safeName: core
releaseInBatch: ${{ parameters.release_core }}
- name: http-jdk-httpclient
groupId: io.clientcore
safeName: httpjdkhttpclient
releaseInBatch: ${{ parameters.release_clientcorehttpjdkhttpclient }}
- name: http-okhttp3
groupId: io.clientcore
safeName: httpokhttp3
Expand Down
3 changes: 1 addition & 2 deletions sdk/clientcore/core-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@

<jacoco.min.linecoverage>0.85</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.75</jacoco.min.branchcoverage>
<jacoco.skip>true</jacoco.skip>

<checkstyle.suppressionsLocation>checkstyle-suppressions.xml</checkstyle.suppressionsLocation>
</properties>
Expand Down Expand Up @@ -136,7 +135,7 @@
<configuration>
<excludes>
<exclude>META-INF/**</exclude>
<exclude>**/io/clientcore/json/implementation/jackson/core/**</exclude>
<exclude>**/io/clientcore/core/json/implementation/jackson/core/**</exclude>
</excludes>
</configuration>
</plugin>
Expand Down
3 changes: 3 additions & 0 deletions sdk/clientcore/core-json/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

/**
* This module provides a JSON tree model for representing JSON data.
*/
module io.clientcore.core.json {
exports io.clientcore.core.json;
exports io.clientcore.core.json.models;
Expand Down
29 changes: 3 additions & 26 deletions sdk/clientcore/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jacoco.min.linecoverage>0.60</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.60</jacoco.min.branchcoverage>
<jacoco.skip>true</jacoco.skip>

<javaModulesSurefireArgLine>
--add-opens io.clientcore.core/io.clientcore.core.annotation=ALL-UNNAMED
--add-opens io.clientcore.core/io.clientcore.core.credential=ALL-UNNAMED
Expand All @@ -64,7 +64,6 @@

--add-exports io.clientcore.core/io.clientcore.core.shared=ALL-UNNAMED
--add-exports io.clientcore.core/io.clientcore.core.implementation=ALL-UNNAMED

</javaModulesSurefireArgLine>

<!-- If JMH benchmarking was ran Checkstyle may fail on jmh_benchmark generated classes, ignore them. -->
Expand All @@ -73,9 +72,7 @@
<!-- Enables fail on deprecated API usage. -->
<compiler.failondeprecatedstatus/>

<javadoc.excludePackageNames>
io.clientcore.core.json,com.azure.json,com.azure.xml,com.azure.core*
</javadoc.excludePackageNames>
<javadoc.excludePackageNames>io.clientcore.core.json*</javadoc.excludePackageNames>
</properties>

<dependencies>
Expand Down Expand Up @@ -135,31 +132,11 @@
<version>2.5.2</version> <!-- {x-version-update;org.conscrypt:conscrypt-openjdk-uber;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<!-- bytebuddy dependencies are required for mockito 4.11.0 to work with Java 21. Mockito 4.11.0 is the last release -->
<!-- of Mockito supporting Java 8 as a baseline. -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.15.5</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.15.5</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<!-- RestProxyTests is inherited by tests in http-okhttp3 and http-jdk-httpclient -->
<!-- RestProxyTests is inherited by tests in http-okhttp3 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
Loading
Loading