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 2023/01/22 18:25:13 UTC
[maven-deploy-plugin] branch MDEPLOY-304 updated (f8a22c3 -> cf7fe0c)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MDEPLOY-304
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
discard f8a22c3 [MDEPLOY-304] Cleanup IT tests
new cf7fe0c [MDEPLOY-304] Cleanup IT tests
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f8a22c3)
\
N -- N -- N refs/heads/MDEPLOY-304 (cf7fe0c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
src/it/attach-jar-checksum-release/pom.xml | 97 ----------------------
src/it/attach-jar-checksum-release/setup.bsh | 29 -------
src/it/attach-jar-checksum-release/verify.groovy | 64 --------------
src/it/attach-jar-checksum-snapshot/pom.xml | 96 ---------------------
src/it/attach-jar-checksum-snapshot/setup.bsh | 29 -------
src/it/attach-jar-checksum-snapshot/verify.groovy | 95 ---------------------
.../invoker.properties | 18 ----
src/it/setup-mock-phase-maven-plugin/pom.xml | 57 -------------
.../main/resources/META-INF/plexus/components.xml | 40 ---------
.../org/apache/maven/plugins/deploy/Utils.java | 57 -------------
10 files changed, 582 deletions(-)
delete mode 100644 src/it/attach-jar-checksum-release/pom.xml
delete mode 100644 src/it/attach-jar-checksum-release/setup.bsh
delete mode 100644 src/it/attach-jar-checksum-release/verify.groovy
delete mode 100644 src/it/attach-jar-checksum-snapshot/pom.xml
delete mode 100644 src/it/attach-jar-checksum-snapshot/setup.bsh
delete mode 100644 src/it/attach-jar-checksum-snapshot/verify.groovy
delete mode 100644 src/it/setup-mock-phase-maven-plugin/invoker.properties
delete mode 100644 src/it/setup-mock-phase-maven-plugin/pom.xml
delete mode 100644 src/it/setup-mock-phase-maven-plugin/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 src/test/java/org/apache/maven/plugins/deploy/Utils.java
[maven-deploy-plugin] 01/01: [MDEPLOY-304] Cleanup IT tests
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MDEPLOY-304
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit cf7fe0cbb9c723d18b7689a981eda375a9afe909
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Jan 22 18:50:34 2023 +0100
[MDEPLOY-304] Cleanup IT tests
---
pom.xml | 14 +++
.../invoker.properties | 3 +-
.../MDEPLOY-169_deploy-at-end-multithread/pom.xml | 12 +--
.../pom.xml | 12 +--
src/it/MDEPLOY-212/pom.xml | 2 +-
src/it/MDEPLOY-213/pom.xml | 2 +-
.../pom.xml | 10 +-
src/it/alt-deploy-repo-with-dist-mgmt/pom.xml | 10 +-
src/it/alt-deploy-repo-without-dist-mgmt/pom.xml | 10 +-
src/it/attach-jar-checksum-release/pom.xml | 103 ---------------------
src/it/attach-jar-checksum-release/setup.bsh | 29 ------
src/it/attach-jar-checksum-release/verify.groovy | 64 -------------
src/it/attach-jar-checksum-snapshot/pom.xml | 102 --------------------
src/it/attach-jar-checksum-snapshot/setup.bsh | 29 ------
src/it/attach-jar-checksum-snapshot/verify.groovy | 95 -------------------
src/it/attach-release-jar/pom.xml | 15 +--
src/it/deploy-at-end-fail/module1/pom.xml | 2 +-
src/it/deploy-at-end-fail/pom.xml | 12 +--
src/it/deploy-at-end-pass/module1/pom.xml | 23 -----
src/it/deploy-at-end-pass/pom.xml | 12 +--
src/it/deploy-attached-sources/pom.xml | 4 +-
src/it/deploy-default-packaging/pom.xml | 4 +-
src/it/mdeploy-45-test/pom.xml | 4 +-
src/it/no-main-artifact-1/pom.xml | 16 ++--
src/it/no-main-artifact-2/pom.xml | 16 ++--
src/it/no-main-artifact-snapshot/pom.xml | 8 +-
src/it/non-default-pom/non-default-pom.xml | 7 +-
src/it/offline/pom.xml | 10 +-
src/it/release-jar/pom.xml | 10 +-
src/it/release-pom/pom.xml | 13 +--
src/it/skip-release-jar/pom.xml | 10 +-
src/it/skip-snapshot-jar/pom.xml | 10 +-
src/it/skip/pom.xml | 13 +--
src/it/snapshot-jar/pom.xml | 10 +-
src/it/snapshot-pom/pom.xml | 13 +--
.../org/apache/maven/plugins/deploy/Utils.java | 57 ------------
36 files changed, 130 insertions(+), 636 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c30c55..d2f9975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,20 @@ under the License.
<slf4jVersion>1.7.5</slf4jVersion>
<!-- Keep in sync with resolver used in maven above -->
<resolverVersion>1.0.0.v20140518</resolverVersion>
+
+ <!-- plugins version used in IT tests -->
+ <mavenAntrunPluginVersion>3.1.0</mavenAntrunPluginVersion>
+ <mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
+ <mavenEnforcerPluginVersion>3.1.0</mavenEnforcerPluginVersion>
+ <mavenInstallPluginVersion>3.1.0</mavenInstallPluginVersion>
+ <mavenJarPluginVersion>3.3.0</mavenJarPluginVersion>
+ <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
+ <mavenPluginToolsVersion>${maven.plugin.tools.version}</mavenPluginToolsVersion>
+ <mavenResourcesPluginVersion>3.3.0</mavenResourcesPluginVersion>
+ <mavenSourcePluginVersion>3.2.1</mavenSourcePluginVersion>
+ <mavenSurefirePluginVersion>${surefire.version}</mavenSurefirePluginVersion>
+ <mavenWarPluginVersion>3.3.2</mavenWarPluginVersion>
+
<project.build.outputTimestamp>2022-07-16T16:14:30Z</project.build.outputTimestamp>
</properties>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties b/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
index 18efa76..4668448 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
+++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-invoker.goals = clean deploy -T2
-invoker.maven.version = 3.0+
\ No newline at end of file
+invoker.goals = clean deploy -T2
\ No newline at end of file
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml b/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
index 576847d..af8d8c2 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
+++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml b/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
index 42f53da..8884e13 100644
--- a/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
+++ b/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/MDEPLOY-212/pom.xml b/src/it/MDEPLOY-212/pom.xml
index c6376ff..8bca65b 100644
--- a/src/it/MDEPLOY-212/pom.xml
+++ b/src/it/MDEPLOY-212/pom.xml
@@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>@mavenJavadocPluginVersion@</version>
<executions>
<execution>
<id>attach-javadoc</id>
diff --git a/src/it/MDEPLOY-213/pom.xml b/src/it/MDEPLOY-213/pom.xml
index 36e6d23..ff4574d 100644
--- a/src/it/MDEPLOY-213/pom.xml
+++ b/src/it/MDEPLOY-213/pom.xml
@@ -46,7 +46,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>@mavenJavadocPluginVersion@</version>
<executions>
<execution>
<id>attach-javadoc</id>
diff --git a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
index ac1f97e..cd94381 100644
--- a/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
+++ b/src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
@@ -48,7 +48,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -58,22 +58,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml b/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
index aa1dd73..e29e00f 100644
--- a/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
+++ b/src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
@@ -48,7 +48,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -58,22 +58,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml b/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
index a6826e9..185d92d 100644
--- a/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
+++ b/src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
@@ -41,7 +41,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -51,22 +51,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/attach-jar-checksum-release/pom.xml b/src/it/attach-jar-checksum-release/pom.xml
deleted file mode 100644
index bda659d..0000000
--- a/src/it/attach-jar-checksum-release/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.deploy.ajc</groupId>
- <artifactId>test</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
-
- <description>
- This test has been moved from maven-install-plugin to maven-deploy-plugin.
- Tests the installation of a simple snapshot JAR with an attached artifact and checksums
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
- <distributionManagement>
- <repository>
- <id>it</id>
- <url>file:///${basedir}/target/remoterepo</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- <!--
- ! This is intentionally the old version which
- ! will not create checksums by default.
- ! We want to make sure that only maven-deploy-plugin
- ! will generate the checksums.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <createChecksum>false</createChecksum>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/src/it/attach-jar-checksum-release/setup.bsh b/src/it/attach-jar-checksum-release/setup.bsh
deleted file mode 100644
index 4d73971..0000000
--- a/src/it/attach-jar-checksum-release/setup.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-
-import org.codehaus.plexus.util.*;
-
-File file = new File( basedir, "org/apache/maven/its/deploy/ajc" );
-System.out.println( "Deleting " + file );
-FileUtils.deleteDirectory( file );
-
-return true;
diff --git a/src/it/attach-jar-checksum-release/verify.groovy b/src/it/attach-jar-checksum-release/verify.groovy
deleted file mode 100644
index ac362f8..0000000
--- a/src/it/attach-jar-checksum-release/verify.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-
-import org.apache.maven.plugins.deploy.Utils;
-
-def paths =
-[
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.pom",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.pom.md5",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.pom.sha1",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.jar",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.jar.md5",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.jar.sha1",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0-sources.jar",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0-sources.jar.md5",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0-sources.jar.sha1",
- "org/apache/maven/its/deploy/ajc/test/maven-metadata.xml",
- "org/apache/maven/its/deploy/ajc/test/maven-metadata.xml.md5",
- "org/apache/maven/its/deploy/ajc/test/maven-metadata.xml.sha1",
-]
-
-def cksumToCheckPaths = [
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.pom",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0.jar",
- "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0-sources.jar"
-]
-
-// Check if artifacts have been uploaded to remote with checksums
-def repository = new File (basedir, "target/remoterepo" )
-paths.each { path ->
- //File file = new File( localRepositoryPath, path );
- File file = new File( repository, path );
- println "Checking for existence of ${file}"
- if ( !file.isFile() )
- {
- throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
- }
- if ( cksumToCheckPaths.contains( path ) )
- {
- println "Verifying ${file}"
- Utils.verifyChecksum( file );
- }
-}
-
-return true;
diff --git a/src/it/attach-jar-checksum-snapshot/pom.xml b/src/it/attach-jar-checksum-snapshot/pom.xml
deleted file mode 100644
index 89ddce7..0000000
--- a/src/it/attach-jar-checksum-snapshot/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.deploy.ajc</groupId>
- <artifactId>test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <description>
- Tests the deployment of a simple SNAPSHOT JAR with an attached artifact and checksums
- </description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
- <distributionManagement>
- <repository>
- <id>it</id>
- <url>file:///${basedir}/target/remoterepo</url>
- </repository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <!--
- ! This is intentionally the old version which
- ! will not create checksums by default.
- ! We want to make sure that only maven-deploy-plugin
- ! will generate the checksums.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <createChecksum>false</createChecksum>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/src/it/attach-jar-checksum-snapshot/setup.bsh b/src/it/attach-jar-checksum-snapshot/setup.bsh
deleted file mode 100644
index 7d54f90..0000000
--- a/src/it/attach-jar-checksum-snapshot/setup.bsh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.*;
-import java.util.*;
-
-import org.codehaus.plexus.util.*;
-
-File file = new File( basedir, "target/remoterepo/org/apache/maven/its/deploy/ajc" );
-System.out.println( "Deleting " + file );
-FileUtils.deleteDirectory( file );
-
-return true;
diff --git a/src/it/attach-jar-checksum-snapshot/verify.groovy b/src/it/attach-jar-checksum-snapshot/verify.groovy
deleted file mode 100644
index 0a4a14f..0000000
--- a/src/it/attach-jar-checksum-snapshot/verify.groovy
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.deploy.Utils;
-
-def pathsInTargetDirectory = [
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.pom",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.pom\\.md5",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.pom\\.sha1",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.jar",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.jar\\.md5",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.jar\\.sha1",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\-sources\\.jar",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\-sources\\.jar\\.md5",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\-sources\\.jar\\.sha1",
- //The following files will be generated. But they can't be check for the checksums
- //cause they contain timestamps which means they change everytime.
- "maven\\-metadata\\.xml",
- "maven\\-metadata\\.xml\\.md5",
- "maven\\-metadata\\.xml\\.sha1",
-]
-
-def checkSumsToCheckPaths = [
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.pom",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\.jar",
- "test\\-1\\.0\\-\\d{8}\\.\\d{6}\\-\\d{1}\\-sources\\.jar",
-]
-
-// All files are being deployed to that location. See pom.xml
-def repository = new File (basedir, "target/remoterepo/org/apache/maven/its/deploy/ajc/test/1.0-SNAPSHOT" )
-
-// Read all files from the target directory.
-def filesInDirectory = []
-repository.eachFile() { file ->
- filesInDirectory << file.getName()
-}
-
-println "Size: ${filesInDirectory.size()} / ${pathsInTargetDirectory.size()}"
-
-// First Step is to check the number of files found in directory against
-// the number of files we expect to find.
-if (filesInDirectory.size() != pathsInTargetDirectory.size()) {
- throw new Exception( "The number of files in filesInDirectory and the number of files in pathsInTargetDirectory are not equal" );
-}
-
-// The following will check for the existence of all given
-// files based on the given regular expressions.
-// This is needed cause the time stamp in the file name
-// changes each time this test will be running.
-filesInDirectory.each { existingFile ->
- def result = false
- pathsInTargetDirectory.each { searchItem ->
- def expected = existingFile ==~ searchItem
- println "existingFile: ${existingFile} ${searchItem} expeced:${expected}"
- if (expected) {
- result = true
- }
- }
-
- if (!result) {
- throw new FileNotFoundException ( "Missing: ${existingFile}" )
- }
-}
-
-// The following will check the existing checksums.
-filesInDirectory.each { existingFile ->
- def result = false
- checkSumsToCheckPaths.each { searchItem ->
- //search for the file name pattern..
- def expected = existingFile ==~ searchItem
- if (expected) {
- println "Verifying ${existingFile}"
- Utils.verifyChecksum( new File(repository, existingFile) );
- }
- }
-}
-
-return true;
-
diff --git a/src/it/attach-release-jar/pom.xml b/src/it/attach-release-jar/pom.xml
index 4557d22..916f246 100644
--- a/src/it/attach-release-jar/pom.xml
+++ b/src/it/attach-release-jar/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -81,11 +81,14 @@ under the License.
</goals>
</execution>
</executions>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/deploy-at-end-fail/module1/pom.xml b/src/it/deploy-at-end-fail/module1/pom.xml
index 7b48b48..ba919db 100644
--- a/src/it/deploy-at-end-fail/module1/pom.xml
+++ b/src/it/deploy-at-end-fail/module1/pom.xml
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
+ <version>@mavenEnforcerPluginVersion@</version>
<executions>
<execution>
<id>enforce</id>
diff --git a/src/it/deploy-at-end-fail/pom.xml b/src/it/deploy-at-end-fail/pom.xml
index be9ef50..ed5f9ba 100644
--- a/src/it/deploy-at-end-fail/pom.xml
+++ b/src/it/deploy-at-end-fail/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/deploy-at-end-pass/module1/pom.xml b/src/it/deploy-at-end-pass/module1/pom.xml
index 1a91fc5..602a8f5 100644
--- a/src/it/deploy-at-end-pass/module1/pom.xml
+++ b/src/it/deploy-at-end-pass/module1/pom.xml
@@ -22,27 +22,4 @@
</parent>
<artifactId>module1</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <AlwaysPass />
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/src/it/deploy-at-end-pass/pom.xml b/src/it/deploy-at-end-pass/pom.xml
index ecf739a..04250d5 100644
--- a/src/it/deploy-at-end-pass/pom.xml
+++ b/src/it/deploy-at-end-pass/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/deploy-attached-sources/pom.xml b/src/it/deploy-attached-sources/pom.xml
index 43a2e22..01a4824 100644
--- a/src/it/deploy-attached-sources/pom.xml
+++ b/src/it/deploy-attached-sources/pom.xml
@@ -49,7 +49,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -62,7 +62,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>@mavenJavadocPluginVersion@</version>
<executions>
<execution>
<id>attach-javadoc</id>
diff --git a/src/it/deploy-default-packaging/pom.xml b/src/it/deploy-default-packaging/pom.xml
index 9764c8b..9440f68 100644
--- a/src/it/deploy-default-packaging/pom.xml
+++ b/src/it/deploy-default-packaging/pom.xml
@@ -49,7 +49,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@mavenSourcePluginVersion@</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -62,7 +62,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>@mavenJavadocPluginVersion@</version>
<executions>
<execution>
<id>attach-javadoc</id>
diff --git a/src/it/mdeploy-45-test/pom.xml b/src/it/mdeploy-45-test/pom.xml
index 2447705..cdefaad 100644
--- a/src/it/mdeploy-45-test/pom.xml
+++ b/src/it/mdeploy-45-test/pom.xml
@@ -54,7 +54,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>@mavenResourcesPluginVersion@</version>
<executions>
<execution>
<goals>
@@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenWarPluginVersion@</version>
<executions>
<execution>
<goals>
diff --git a/src/it/no-main-artifact-1/pom.xml b/src/it/no-main-artifact-1/pom.xml
index a9a7c2b..18944b6 100644
--- a/src/it/no-main-artifact-1/pom.xml
+++ b/src/it/no-main-artifact-1/pom.xml
@@ -49,14 +49,14 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>@mavenAntrunPluginVersion@</version>
<configuration>
- <tasks>
+ <target>
<!--
NOTE: The Compiler Plugin sets this as the main artifact file, should be non-existent for this test.
-->
<delete dir="target/classes"/>
- </tasks>
+ </target>
</configuration>
<executions>
<execution>
@@ -71,7 +71,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -81,7 +81,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
<configuration>
<classifier>it</classifier>
</configuration>
@@ -89,17 +89,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/no-main-artifact-2/pom.xml b/src/it/no-main-artifact-2/pom.xml
index e063973..f9644f9 100644
--- a/src/it/no-main-artifact-2/pom.xml
+++ b/src/it/no-main-artifact-2/pom.xml
@@ -48,14 +48,14 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>@mavenAntrunPluginVersion@</version>
<configuration>
- <tasks>
+ <target>
<!--
NOTE: The Compiler Plugin sets this as the main artifact file, should be existent for this test.
-->
<mkdir dir="target/classes"/>
- </tasks>
+ </target>
</configuration>
<executions>
<execution>
@@ -70,7 +70,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -80,7 +80,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
<configuration>
<classifier>it</classifier>
</configuration>
@@ -88,17 +88,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/no-main-artifact-snapshot/pom.xml b/src/it/no-main-artifact-snapshot/pom.xml
index cb90610..89c4fc9 100644
--- a/src/it/no-main-artifact-snapshot/pom.xml
+++ b/src/it/no-main-artifact-snapshot/pom.xml
@@ -48,7 +48,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
<executions>
<execution>
<goals>
@@ -65,7 +65,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
<executions>
<execution>
<goals>
@@ -80,12 +80,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
<executions>
<execution>
<goals>
diff --git a/src/it/non-default-pom/non-default-pom.xml b/src/it/non-default-pom/non-default-pom.xml
index 231a7c1..e97b2b9 100644
--- a/src/it/non-default-pom/non-default-pom.xml
+++ b/src/it/non-default-pom/non-default-pom.xml
@@ -52,12 +52,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/offline/pom.xml b/src/it/offline/pom.xml
index 32e53ec..cdad63c 100644
--- a/src/it/offline/pom.xml
+++ b/src/it/offline/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/release-jar/pom.xml b/src/it/release-jar/pom.xml
index af72e7d..1d275c9 100644
--- a/src/it/release-jar/pom.xml
+++ b/src/it/release-jar/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/release-pom/pom.xml b/src/it/release-pom/pom.xml
index d7bff31..fe9c110 100644
--- a/src/it/release-pom/pom.xml
+++ b/src/it/release-pom/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/skip-release-jar/pom.xml b/src/it/skip-release-jar/pom.xml
index 3e57a45..2774462 100644
--- a/src/it/skip-release-jar/pom.xml
+++ b/src/it/skip-release-jar/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/skip-snapshot-jar/pom.xml b/src/it/skip-snapshot-jar/pom.xml
index a58a66f..a009904 100644
--- a/src/it/skip-snapshot-jar/pom.xml
+++ b/src/it/skip-snapshot-jar/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/skip/pom.xml b/src/it/skip/pom.xml
index 0b50d38..652b308 100644
--- a/src/it/skip/pom.xml
+++ b/src/it/skip/pom.xml
@@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -55,22 +55,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/snapshot-jar/pom.xml b/src/it/snapshot-jar/pom.xml
index bd215e0..899b583 100644
--- a/src/it/snapshot-jar/pom.xml
+++ b/src/it/snapshot-jar/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>@mavenJarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/snapshot-pom/pom.xml b/src/it/snapshot-pom/pom.xml
index 735559d..5ff795c 100644
--- a/src/it/snapshot-pom/pom.xml
+++ b/src/it/snapshot-pom/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>@mavenCompilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,22 +57,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenInstallPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>@mavenResourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>@mavenSurefirePluginVersion@</version>
</plugin>
</plugins>
</build>
diff --git a/src/test/java/org/apache/maven/plugins/deploy/Utils.java b/src/test/java/org/apache/maven/plugins/deploy/Utils.java
deleted file mode 100644
index 8fc876a..0000000
--- a/src/test/java/org/apache/maven/plugins/deploy/Utils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.plugins.deploy;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.eclipse.aether.util.ChecksumUtils;
-
-/**
- * A utility class to assist testing.
- * used in IntegrationTests like attach-jar-checksum-snapshot, attach-jar-checksum-snapshot
- *
- * @author Benjamin Bentmann
- */
-public class Utils {
-
- public static final List<String> CHECKSUM_ALGORITHMS = Arrays.asList("MD5", "SHA-1");
-
- /**
- * Verifies the checksum files in the local repo for the given file.
- *
- * @param file The file to verify its checksum with, must not be <code>null</code>.
- * @throws MojoExecutionException In case the checksums were incorrect.
- * @throws IOException If the files couldn't be read.
- */
- public static void verifyChecksum(File file) throws MojoExecutionException, IOException {
- Map<String, Object> checksums = ChecksumUtils.calc(file, CHECKSUM_ALGORITHMS);
- for (Map.Entry<String, Object> entry : checksums.entrySet()) {
- File cksumFile = new File(file + "." + entry.getKey().toLowerCase().replace("-", ""));
- String actualChecksum = ChecksumUtils.read(cksumFile);
- if (!actualChecksum.equals(entry.getValue())) {
- throw new MojoExecutionException("Incorrect " + entry.getKey() + " checksum for file: " + file);
- }
- }
- }
-}