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.

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

Jump to bottom

Update Maven Plugins #111

Merged
merged 3 commits into from
May 9, 2024
Merged

Update Maven Plugins #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9395ce6
Update Maven Plugins
cstamas May 8, 2024
ae2eb5c
This is not needed for surefire anymore, remove version for simple match
cstamas May 8, 2024
6f110f9
Added --add-opens
cstamas May 8, 2024
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 org.eclipse.sisu.inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>-Xmx64m @{jacoco.argLine}</argLine>
<argLine>-Xmx64m --add-opens java.base/java.lang=ALL-UNNAMED @{jacoco.argLine}</argLine>
<classpathDependencyExcludes>
<classpathDependencyExclude>com.google.guava:guava</classpathDependencyExclude>
<classpathDependencyExclude>com.google.inject:guice</classpathDependencyExclude>
Expand Down
56 changes: 22 additions & 34 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
<properties>
<maven.compiler.release>8</maven.compiler.release>
<!-- Set to same version as release target for consistency -->
<maven.compiler.source>1.${maven.compiler.release}</maven.compiler.source>
<maven.compiler.target>1.${maven.compiler.release}</maven.compiler.target>
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can fully remove those properties, as we build with Java11+ only

Copy link
Member Author

@cstamas cstamas May 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

They were originally added as some tools and IDEs (IDEA) did not pick up maven.compiler.release, so just to "fully advertise" to all tools out there that project is 8. We can remove them, but there is no harm in them either.

<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<mavenBuildVersion>3.6.3</mavenBuildVersion>
Expand All @@ -130,7 +130,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.0</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -143,7 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.1</version>
<configuration>
<rules>
<enforceBytecodeVersion>
Expand All @@ -152,7 +152,7 @@
<!-- Used in tests only -->
<exclude>org.junit.jupiter:junit-jupiter-api</exclude>
<exclude>org.junit.platform:junit-platform-commons</exclude>
<exclude>org.apache.felix:org.apache.felix.framework:jar:7.0.5</exclude>
<exclude>org.apache.felix:org.apache.felix.framework</exclude>
</excludes>
</enforceBytecodeVersion>
<requireMavenVersion>
Expand All @@ -175,14 +175,14 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.1</version>
<version>1.8.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -192,38 +192,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<proc>none</proc>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
</dependency>
<!-- some tests leverage JUnit3 still -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.10.0</version>
</dependency>
</dependencies>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
Expand All @@ -249,7 +237,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>default-jar</id>
Expand All @@ -264,27 +252,27 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -304,7 +292,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -317,7 +305,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
<configuration>
<overview>${basedir}/overview.html</overview>
<excludePackageNames>*.internal,*.asm</excludePackageNames>
Expand All @@ -337,7 +325,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.4</version>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
<useAgent>true</useAgent>
Expand Down Expand Up @@ -365,7 +353,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.2</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
Expand Down
Loading