This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch parent-41
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 47129a44205e3dae2d2a0be02ad073137b1e95c3
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sat Nov 18 10:21:48 2023 +0100
Update parent to 41
---
.../src/test/resources-filtered/bootstrap.txt | 5 ++-
.../simple/pom.hocon | 2 +-
pom.xml | 45 +---------------------
3 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/core-it-suite/src/test/resources-filtered/bootstrap.txt
b/core-it-suite/src/test/resources-filtered/bootstrap.txt
index 23336885f..42b594424 100644
--- a/core-it-suite/src/test/resources-filtered/bootstrap.txt
+++ b/core-it-suite/src/test/resources-filtered/bootstrap.txt
@@ -20,7 +20,7 @@ org.apache.groovy:groovy-ant:4.0.15
org.apache.groovy:groovy:4.0.15
org.apache.maven:maven-api-spi:4.0.0-alpha-8
org.apache.maven:maven-api-model:4.0.0-alpha-8:mdo
-org.apache.maven.extensions:maven-extensions:40:pom
+org.apache.maven.extensions:maven-extensions:41:pom
org.apache.maven.its.plugins.class-loader:dep-c:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-all:${project.version}
@@ -70,11 +70,13 @@ org.apache.maven.its:maven-core-it-support:1.3
org.apache.maven.its:maven-core-it-support:1.4
org.apache.maven.plugin-tools:maven-plugin-annotations:3.3
org.apache.maven.plugins:maven-antrun-plugin:3.0.0
+org.apache.maven.plugins:maven-antrun-plugin:3.1.0
org.apache.maven.plugins:maven-assembly-plugin:3.1.0
org.apache.maven.plugins:maven-clean-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-clean-plugin:2.5
org.apache.maven.plugins:maven-clean-plugin:3.1.0
org.apache.maven.plugins:maven-clean-plugin:3.2.0
+org.apache.maven.plugins:maven-clean-plugin:3.3.2
org.apache.maven.plugins:maven-compiler-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-compiler-plugin:3.1
org.apache.maven.plugins:maven-compiler-plugin:3.8.1
@@ -113,6 +115,7 @@
org.apache.maven.plugins:maven-source-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-surefire-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7
+org.apache.maven.plugins:maven-surefire-plugin:3.2.2
org.apache.maven.plugins:maven-war-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-war-plugin:3.3.2
org.apache.maven.plugins:maven-wrapper-plugin:3.1.0
diff --git
a/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
b/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
index 3164b5174..69c190e91 100644
---
a/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
+++
b/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
@@ -20,7 +20,7 @@ modelVersion = 4.0.0
parent {
groupId = org.apache.maven.extensions
artifactId = maven-extensions
- version = 40
+ version = 41
}
groupId = org.apache.maven.its.mng-7836
artifactId = hocon-simple
diff --git a/pom.xml b/pom.xml
index 43809b5c8..4baa93483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>39</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <version>41</version>
+ <relativePath />
</parent>
<groupId>org.apache.maven.its</groupId>
@@ -151,32 +151,6 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <!-- Remove when Parent 41 used -->
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.40.0</version>
- <configuration>
- <java>
- <!-- orders of used formatters are important MPOM-376 -->
- <!-- eg. palantir override importOrder, so should be first -->
- <palantirJavaFormat>
- <version>2.38.0</version>
- </palantirJavaFormat>
- <removeUnusedImports />
- </java>
- <pom>
- <sortPom>
- <expandEmptyElements>false</expandEmptyElements>
- <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
-
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
- </sortPom>
- </pom>
- <upToDateChecking>
- <enabled>true</enabled>
- </upToDateChecking>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -252,18 +226,6 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.6.0</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -286,9 +248,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- <!-- waiting for MPIR-267 -->
- <!-- pin down urls to avoid interpolated values from the
modules, waiting for MPIR-290 -->
<anonymousConnection>${project.scm.connection}</anonymousConnection>
<developerConnection>${project.scm.developerConnection}</developerConnection>
</configuration>
