Skip to content

[MRRESOURCES-136] Bump org.apache.maven.plugins:maven-plugins from 40 to 41 #47

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
slawekjaranowski merged 2 commits into from
Feb 18, 2024
Merged

[MRRESOURCES-136] Bump org.apache.maven.plugins:maven-plugins from 40 to 41 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c0dd18
Bump org.apache.maven.plugins:maven-plugins from 40 to 41
dependabot[bot] Dec 7, 2023
b2104eb
Fix build on JDK 21, use default Maven matrix on Jenkins
slawekjaranowski Feb 18, 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 Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
2 changes: 1 addition & 1 deletion src/it/resources/supplemental-artifact/resource-projects/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
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
7 changes: 0 additions & 7 deletions src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
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;
}
}