[MWAR-454] Upgrade Parent to 36
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>
@@ -192,35 +203,6 @@
<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>
<configuration>
@@ -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