Skip to content

Only Compile module-info.java in intermediate compile #29701

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.

Sign up for GitHub

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

Merged
alzimmermsft merged 6 commits into from
Jun 29, 2022
Merged

Only Compile module-info.java in intermediate compile #29701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c723ce0
Only Compile module-info.java in intermediate compile
alzimmermsft Jun 29, 2022
cc3e7ba
Fix JDK HttpClient compilation
alzimmermsft Jun 29, 2022
5b0f57b
Reference issue to add module-info to tests
alzimmermsft Jun 29, 2022
6fd7a3a
Merge branch 'main' into AzEng_SimplifyJava11Compile
alzimmermsft Jun 29, 2022
fe34abf
Revert back to Java 11
alzimmermsft Jun 29, 2022
922c5c6
One more Java 11 reference
alzimmermsft Jun 29, 2022
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
2 changes: 1 addition & 1 deletion sdk/core/azure-core-http-jdk-httpclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</build>

<profiles>
<!-- Library cannot build for Java 10 and below -->
<!-- Library cannot build for Java 11 and below -->
<profile>
<id>java8</id>
<activation>
Expand Down
18 changes: 6 additions & 12 deletions sdk/parents/azure-client-sdk-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@
</configuration>
<executions>
<!-- compile first with VM's default Java version -->
<!-- this will generate module-info with major class version 61 or higher (i.e Java 17 or higher) -->
<!-- this will generate module-info with major class version based on the Java version being used, in CI this should be 61 (i.e Java 17) -->
<execution>
<id>default-compile</id>
<goals>
Expand All @@ -985,6 +985,7 @@
<release>${java.vm.specification.version}</release>
</configuration>
</execution>

<!-- then compile with Java 11 as the base version that supports module-info -->
<!-- this is the Azure SDK baseline for jars that are released to Maven and should only be updated
when the Azure SDK policy is changed -->
Expand All @@ -996,8 +997,12 @@
</goals>
<configuration>
<release>11</release>
<includes>
<include>module-info.java</include>
</includes>
</configuration>
</execution>

<!-- then compile without module-info for Java 8 -->
<execution>
<id>base-compile</id>
Expand All @@ -1023,17 +1028,6 @@
</configuration>
</execution>

<!-- compile tests with Java 11 -->
<execution>
<id>base-modules-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<testRelease>11</testRelease>
</configuration>
</execution>

<!-- then compile with Java 8 -->
<execution>
<id>base-testCompile</id>
Expand Down