You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/04/25 16:50:17 UTC
[maven-war-plugin] branch MWAR-454 created (now 2a002d1)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MWAR-454
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
at 2a002d1 [MWAR-454] Upgrade Parent to 36
This branch includes the following new commits:
new 2a002d1 [MWAR-454] Upgrade Parent to 36
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-war-plugin] 01/01: [MWAR-454] Upgrade Parent to 36
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MWAR-454
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 2a002d1ba7b69fd070f4385f92d79d368224fc84
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Mon Apr 25 18:49:32 2022 +0200
[MWAR-454] Upgrade Parent to 36
---
pom.xml | 69 +++++------------------
src/it/MWAR-128/{prebuild.groovy => setup.groovy} | 0
2 files changed, 14 insertions(+), 55 deletions(-)
diff --git a/pom.xml b/pom.xml
index 188f1bb..fe5e2c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>34</version>
+ <version>36</version>
<relativePath />
</parent>
@@ -84,6 +84,18 @@
</contributor>
</contributors>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- change scope for transitive dependency -->
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -158,7 +170,6 @@
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.3.5</version>
<scope>provided</scope>
</dependency>
@@ -191,35 +202,6 @@
</resources>
<pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion combine.children="append">
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- </enforceBytecodeVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -232,9 +214,9 @@
</excludes>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -262,30 +244,7 @@
<goal>clean</goal>
<goal>package</goal>
</goals>
- <projectsDirectory>src/it</projectsDirectory>
- <postBuildHookScript>verify</postBuildHookScript>
- <preBuildHookScript>prebuild</preBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
</configuration>
- <executions>
- <execution>
- <id>install</id>
- <phase>pre-integration-tests</phase>
- <goals>
- <goal>install</goal>
- </goals>
- <configuration>
- <extraArtifacts>
- <extraArtifact>javax.servlet:servlet-api:2.4:jar</extraArtifact>
- <extraArtifact>javax.servlet:javax.servlet-api:3.0.1:jar</extraArtifact>
- <extraArtifact>org.apache.struts:struts-core:1.3.9:jar</extraArtifact>
- <extraArtifact>org.codehaus.plexus:plexus-utils:1.4.7:jar:sources</extraArtifact>
- </extraArtifacts>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/src/it/MWAR-128/prebuild.groovy b/src/it/MWAR-128/setup.groovy
similarity index 100%
rename from src/it/MWAR-128/prebuild.groovy
rename to src/it/MWAR-128/setup.groovy