Skip to content

HDDS-13656. Fix aspectj settings for Java 11+ #9010

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
adoroszlai merged 6 commits into from
Sep 17, 2025
Merged

HDDS-13656. Fix aspectj settings for Java 11+ #9010

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2214baf
HDDS-13656. Fix aspectj under JDK9+ compilation
symious Sep 8, 2025
e2fcc1d
HDDS-13656. Fix aspectj for jdk11
symious Sep 8, 2025
3c11fca
HDDS-13656. Sort the pom
symious Sep 8, 2025
b7df320
HDDS-13656. Refactor the profile
symious Sep 9, 2025
c54cba1
HDDS-13656. Use release
symious Sep 10, 2025
f82e15d
Remove jdk9-or-later profile
symious Sep 12, 2025
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
13 changes: 10 additions & 3 deletions hadoop-ozone/ozone-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,17 +453,24 @@
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Comment thread
errose28 marked this conversation as resolved.
Outdated
<argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>${aspectj.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<complianceLevel>1.8</complianceLevel>
<complianceLevel>${maven.compiler.source}</complianceLevel>
</configuration>
</execution>
</executions>
Expand Down
29 changes: 21 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<aopalliance.version>1.0</aopalliance.version>
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
<aspectj-plugin.version>1.14.1</aspectj-plugin.version>
<aspectj.java11.version>1.9.20</aspectj.java11.version>
<aspectj.java21.version>1.9.24</aspectj.java21.version>
<aspectj.version>1.9.7</aspectj.version>
Comment thread
errose28 marked this conversation as resolved.
<assertj.version>3.27.4</assertj.version>
<aws-java-sdk.version>1.12.788</aws-java-sdk.version>
Expand Down Expand Up @@ -162,6 +164,8 @@
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
<maven.compiler.source>${javac.version}</maven.compiler.source>
<maven.compiler.target>${javac.version}</maven.compiler.target>
<maven.core.version>3.9.10</maven.core.version>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<metainf-services.version>1.11</metainf-services.version>
Expand Down Expand Up @@ -2672,23 +2676,32 @@
</profile>
<!-- Profiles for specific JDK versions -->
<profile>
<id>java8</id>
<id>java9-or-later</id>
<activation>
<jdk>[,8]</jdk>
<jdk>[9,]</jdk>
</activation>
<properties>
<maven.compiler.source>${javac.version}</maven.compiler.source>
<maven.compiler.target>${javac.version}</maven.compiler.target>
<!-- supported since Java 9 -->
<maven.compiler.release>${javac.version}</maven.compiler.release>

@adoroszlai adoroszlai Sep 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also set in global properties, so I guess we can remove the java9-or-later profile.

@symious symious Sep 12, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

</properties>
</profile>
<!-- Profiles for specific aspectj versions -->
<profile>
<id>java9-or-later</id>
<id>aspectj-java11-20</id>
<activation>
<jdk>[9,]</jdk>
<jdk>[11,20]</jdk>
</activation>
<properties>
<!-- supported since Java 9 -->
<maven.compiler.release>${javac.version}</maven.compiler.release>
<aspectj.version>${aspectj.java11.version}</aspectj.version>
</properties>
</profile>
<profile>
<id>aspectj-java21-or-later</id>
<activation>
<jdk>[21,]</jdk>
</activation>
<properties>
<aspectj.version>${aspectj.java21.version}</aspectj.version>
</properties>
</profile>
<profile>
Expand Down