Skip to content

Commit

Permalink
[MRRESOURCES-136] Bump org.apache.maven.plugins:maven-plugins from 40…
Browse files Browse the repository at this point in the history
… to 41 (#47)

* Bump org.apache.maven.plugins:maven-plugins from 40 to 41

Bumps [org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent) from 40 to 41.
- [Release notes](https://github.com/apache/maven-parent/releases)
- [Commits](https://github.com/apache/maven-parent/commits)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugins
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix build on JDK 21, use default Maven matrix on Jenkins

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
  • Loading branch information
dependabot[bot] and slawekjaranowski committed Feb 18, 2024
1 parent 3eca627 commit e291208
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -17,4 +17,4 @@
* under the License.
*/

asfMavenTlpPlgnBuild(maven: ['3.6.x','3.8.x'])
asfMavenTlpPlgnBuild()
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>40</version>
<version>41</version>
<relativePath />
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/it/resources/it-parent/pom.xml
Expand Up @@ -66,7 +66,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${version.maven-compiler-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Expand Up @@ -34,7 +34,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${version.maven-compiler-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Expand Up @@ -51,13 +51,6 @@ public static File getBaseDir() {
public static Verifier newVerifier(File dir) throws VerificationException {
Verifier verifier = new Verifier(dir.getAbsolutePath());
verifier.setLocalRepo(System.getProperty("localRepositoryPath"));
verifier.getSystemProperties().setProperty("https.protocols", System.getProperty("https.protocols", "TLSv1.2"));

int javaVersion = Integer.getInteger("java.specification.version", 7);
if (javaVersion >= 12) {
verifier.setSystemProperty("maven.compiler.source", "7");
verifier.setSystemProperty("maven.compiler.target", "7");
}
return verifier;
}
}

0 comments on commit e291208

Please sign in to comment.