diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java index 0a29ea3e1..eca2bc024 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java @@ -382,7 +382,7 @@ private void resolveSnapshots( } switch (Integer.parseInt(resolveSnapshotType.toLowerCase(Locale.ENGLISH))) { - // all + // all case 0: processSnapshot(projectDependencies, releaseDescriptor, autoResolveSnapshots); processSnapshot(pluginDependencies, releaseDescriptor, autoResolveSnapshots); @@ -390,22 +390,22 @@ private void resolveSnapshots( processSnapshot(extensionDependencies, releaseDescriptor, autoResolveSnapshots); break; - // project dependencies + // project dependencies case 1: processSnapshot(projectDependencies, releaseDescriptor, autoResolveSnapshots); break; - // plugins + // plugins case 2: processSnapshot(pluginDependencies, releaseDescriptor, autoResolveSnapshots); break; - // reports + // reports case 3: processSnapshot(reportDependencies, releaseDescriptor, autoResolveSnapshots); break; - // extensions + // extensions case 4: processSnapshot(extensionDependencies, releaseDescriptor, autoResolveSnapshots); break; diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml index e4d6f5a0b..128913591 100644 --- a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml +++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml @@ -25,7 +25,7 @@ under the License. jar 1.0 Maven Quick Start Archetype - http://maven.apache.org + https://maven.apache.org scm:stub| scm:stub| diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml index 9e1c1083e..732a847f0 100644 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml @@ -30,11 +30,6 @@ under the License. scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/${project.scm.tag}/ trunk - - - @maven.compiler.source@ - @maven.compiler.target@ - diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml index 7764e8d13..30363e88a 100644 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml @@ -28,7 +28,7 @@ under the License. release-test-module-one 1.0-SNAPSHOT release-test-module-one - http://maven.apache.org + https://maven.apache.org diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml index 0080dcda1..d76d248b7 100644 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml @@ -28,7 +28,7 @@ under the License. release-test-module-two release-test-module-two 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/pom.xml index 7764e8d13..30363e88a 100644 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/pom.xml @@ -28,7 +28,7 @@ under the License. release-test-module-one 1.0-SNAPSHOT release-test-module-one - http://maven.apache.org + https://maven.apache.org diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-two/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-two/pom.xml index 6f526f609..0e4e8abd9 100644 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-two/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-two/pom.xml @@ -28,7 +28,7 @@ under the License. release-test-module-two release-test-module-two 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org diff --git a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-a/pom.xml index 603366f4a..b5b54e478 100644 --- a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-a/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-a/pom.xml @@ -27,7 +27,7 @@ under the License. org.apache.maven.plugin.release module-a module-a - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-b/pom.xml b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-b/pom.xml index 269fc7897..a6941a10f 100644 --- a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-b/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/module-b/pom.xml @@ -27,7 +27,7 @@ under the License. org.apache.maven.plugin.release module-b module-b - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/pom.xml b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/pom.xml index b44df9cf2..8305e3397 100644 --- a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/pom.xml @@ -24,7 +24,7 @@ under the License. pom ${revision}${sha1}${changelist} parent-project - http://maven.apache.org + https://maven.apache.org scm:stub| scm:stub| @@ -35,8 +35,6 @@ under the License. 1.0.0 -SNAPSHOT - @maven.compiler.source@ - @maven.compiler.target@ diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml index 4ed8dd1de..b3a0a7a4e 100644 --- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-a/pom.xml @@ -29,7 +29,7 @@ under the License. module-a module-a 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml index a40521ff6..3b9dcb009 100644 --- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/module-b/pom.xml @@ -29,7 +29,7 @@ under the License. module-b module-b 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml index 7e3cf539c..672f68631 100644 --- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml @@ -24,17 +24,12 @@ under the License. pom 1.0-SNAPSHOT parent-project - http://maven.apache.org + https://maven.apache.org scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/parent-project scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/parent-project - - @maven.compiler.source@ - @maven.compiler.target@ - - diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml index bae31c640..188c69078 100644 --- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-a/pom.xml @@ -28,7 +28,7 @@ under the License. module-a module-a 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml index 71b5dbbb2..2d1c51087 100644 --- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-b/pom.xml @@ -28,7 +28,7 @@ under the License. module-b module-b 1.0-SNAPSHOT - http://maven.apache.org + https://maven.apache.org org.junit.jupiter diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml index 35dab1836..7bfc51122 100644 --- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml +++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml @@ -24,16 +24,11 @@ under the License. pom 1.0-SNAPSHOT parent-project - http://maven.apache.org + https://maven.apache.org scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/ scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/ - - - @maven.compiler.source@ - @maven.compiler.target@ - diff --git a/pom.xml b/pom.xml index bce1e1716..fc7b8ea99 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven maven-parent - 45 + 47 @@ -95,9 +95,6 @@ under the License. 3.5.3 1.7.36 - - 3.9.1 - maven-release-archives/maven-release-LATEST 2025-12-09T21:54:56Z