diff --git a/pom.xml b/pom.xml index 5c30c552..aeb11b57 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,20 @@ under the License. 1.7.5 1.0.0.v20140518 + + + 3.1.0 + 3.10.1 + 3.1.0 + 3.1.0 + 3.3.0 + 3.4.1 + ${maven.plugin.tools.version} + 3.3.0 + 3.2.1 + ${surefire.version} + 3.3.2 + 2022-07-16T16:14:30Z @@ -215,7 +229,6 @@ under the License. verify ${project.build.directory}/local-repo src/it/settings.xml - true deploy 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 18efa761..50360fc0 100644 --- a/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties +++ b/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties @@ -1,18 +1,17 @@ -# 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. -invoker.goals = clean deploy -T2 -invoker.maven.version = 3.0+ \ No newline at end of file +# 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. +invoker.goals = clean deploy -T2 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 576847dd..af8d8c2b 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-source-plugin - 2.0.4 + @mavenSourcePluginVersion@ attach-sources @@ -88,7 +88,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ 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 42f53daf..8884e138 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-source-plugin - 2.0.4 + @mavenSourcePluginVersion@ attach-sources @@ -88,7 +88,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/MDEPLOY-212/pom.xml b/src/it/MDEPLOY-212/pom.xml index c6376ff4..8bca65b1 100644 --- a/src/it/MDEPLOY-212/pom.xml +++ b/src/it/MDEPLOY-212/pom.xml @@ -38,7 +38,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + @mavenJavadocPluginVersion@ attach-javadoc diff --git a/src/it/MDEPLOY-213/pom.xml b/src/it/MDEPLOY-213/pom.xml index 36e6d23a..ff4574d6 100644 --- a/src/it/MDEPLOY-213/pom.xml +++ b/src/it/MDEPLOY-213/pom.xml @@ -46,7 +46,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + @mavenJavadocPluginVersion@ attach-javadoc 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 ac1f97eb..cd943815 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -58,22 +58,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ 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 aa1dd736..e29e00f4 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -58,22 +58,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ 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 a6826e95..185d92d7 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -51,22 +51,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ 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 bda659d4..00000000 --- a/src/it/attach-jar-checksum-release/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.deploy.ajc - test - 1.0 - jar - - - 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 - - - - true - - - - it - file:///${basedir}/target/remoterepo - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - - org.apache.maven.plugins - maven-deploy-plugin - @project.version@ - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - false - - - - org.apache.maven.plugins - maven-jar-plugin - 2.1 - - - org.apache.maven.plugins - maven-resources-plugin - 2.2 - - - org.apache.maven.plugins - maven-source-plugin - 2.0.4 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.3.1 - - - - - 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 4d739715..00000000 --- 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 ac362f81..00000000 --- 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 89ddce78..00000000 --- a/src/it/attach-jar-checksum-snapshot/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.deploy.ajc - test - 1.0-SNAPSHOT - jar - - - Tests the deployment of a simple SNAPSHOT JAR with an attached artifact and checksums - - - - true - - - - it - file:///${basedir}/target/remoterepo - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - - org.apache.maven.plugins - maven-deploy-plugin - @project.version@ - - - org.apache.maven.plugins - maven-jar-plugin - 2.1 - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - false - - - - org.apache.maven.plugins - maven-resources-plugin - 2.2 - - - org.apache.maven.plugins - maven-source-plugin - 2.0.4 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.3.1 - - - - - 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 7d54f90e..00000000 --- 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 0a4a14f9..00000000 --- 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 4557d222..916f2462 100644 --- a/src/it/attach-release-jar/pom.xml +++ b/src/it/attach-release-jar/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-source-plugin - 2.0.4 + @mavenSourcePluginVersion@ attach-sources @@ -81,11 +81,14 @@ under the License. + + true + org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/deploy-at-end-fail/module1/pom.xml b/src/it/deploy-at-end-fail/module1/pom.xml index 7b48b486..ba919db5 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 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.2 + @mavenEnforcerPluginVersion@ enforce diff --git a/src/it/deploy-at-end-fail/pom.xml b/src/it/deploy-at-end-fail/pom.xml index be9ef50c..ed5f9ba0 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-source-plugin - 2.0.4 + @mavenSourcePluginVersion@ attach-sources @@ -88,7 +88,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/deploy-at-end-pass/module1/pom.xml b/src/it/deploy-at-end-pass/module1/pom.xml index 1a91fc56..602a8f5c 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 @@ module1 - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.2 - - - enforce - - enforce - - - - - - - - - - - - diff --git a/src/it/deploy-at-end-pass/pom.xml b/src/it/deploy-at-end-pass/pom.xml index ecf739a8..04250d5a 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-source-plugin - 2.0.4 + @mavenSourcePluginVersion@ attach-sources @@ -88,7 +88,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/deploy-attached-sources/pom.xml b/src/it/deploy-attached-sources/pom.xml index 43a2e22e..01a48240 100644 --- a/src/it/deploy-attached-sources/pom.xml +++ b/src/it/deploy-attached-sources/pom.xml @@ -49,7 +49,7 @@ under the License. org.apache.maven.plugins maven-source-plugin - 2.1.2 + @mavenSourcePluginVersion@ attach-sources @@ -62,7 +62,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + @mavenJavadocPluginVersion@ attach-javadoc diff --git a/src/it/deploy-default-packaging/pom.xml b/src/it/deploy-default-packaging/pom.xml index 9764c8b8..9440f68f 100644 --- a/src/it/deploy-default-packaging/pom.xml +++ b/src/it/deploy-default-packaging/pom.xml @@ -49,7 +49,7 @@ under the License. org.apache.maven.plugins maven-source-plugin - 2.1.2 + @mavenSourcePluginVersion@ attach-sources @@ -62,7 +62,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 2.7 + @mavenJavadocPluginVersion@ attach-javadoc diff --git a/src/it/mdeploy-45-test/pom.xml b/src/it/mdeploy-45-test/pom.xml index 2447705a..cdefaade 100644 --- a/src/it/mdeploy-45-test/pom.xml +++ b/src/it/mdeploy-45-test/pom.xml @@ -54,7 +54,7 @@ under the License. org.apache.maven.plugins maven-resources-plugin - 2.5 + @mavenResourcesPluginVersion@ @@ -66,7 +66,7 @@ under the License. org.apache.maven.plugins maven-war-plugin - 2.0.2 + @mavenWarPluginVersion@ diff --git a/src/it/no-main-artifact-1/pom.xml b/src/it/no-main-artifact-1/pom.xml index a9a7c2bb..18944b67 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. org.apache.maven.plugins maven-antrun-plugin - 1.1 + @mavenAntrunPluginVersion@ - + - + @@ -71,7 +71,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -81,7 +81,7 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ it @@ -89,17 +89,17 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.3 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/no-main-artifact-2/pom.xml b/src/it/no-main-artifact-2/pom.xml index e063973c..f9644f9b 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. org.apache.maven.plugins maven-antrun-plugin - 1.1 + @mavenAntrunPluginVersion@ - + - + @@ -70,7 +70,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -80,7 +80,7 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ it @@ -88,17 +88,17 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/no-main-artifact-snapshot/pom.xml b/src/it/no-main-artifact-snapshot/pom.xml index cb906106..89c4fc99 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. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ @@ -65,7 +65,7 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ @@ -80,12 +80,12 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.3 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ diff --git a/src/it/non-default-pom/non-default-pom.xml b/src/it/non-default-pom/non-default-pom.xml index 231a7c13..e97b2b9b 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. org.apache.maven.plugins maven-install-plugin - 2.2 - - - org.apache.maven.plugins - maven-site-plugin - 2.0-beta-5 + @mavenInstallPluginVersion@ diff --git a/src/it/offline/pom.xml b/src/it/offline/pom.xml index 32e53ec2..cdad63cf 100644 --- a/src/it/offline/pom.xml +++ b/src/it/offline/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/release-jar/pom.xml b/src/it/release-jar/pom.xml index af72e7d7..1d275c9c 100644 --- a/src/it/release-jar/pom.xml +++ b/src/it/release-jar/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/release-pom/pom.xml b/src/it/release-pom/pom.xml index d7bff31b..fe9c110e 100644 --- a/src/it/release-pom/pom.xml +++ b/src/it/release-pom/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,17 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 - - - org.apache.maven.plugins - maven-site-plugin - 2.0-beta-5 + @mavenSurefirePluginVersion@ diff --git a/src/it/skip-release-jar/pom.xml b/src/it/skip-release-jar/pom.xml index 3e57a45e..2774462e 100644 --- a/src/it/skip-release-jar/pom.xml +++ b/src/it/skip-release-jar/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/skip-snapshot-jar/pom.xml b/src/it/skip-snapshot-jar/pom.xml index a58a66fa..a0099041 100644 --- a/src/it/skip-snapshot-jar/pom.xml +++ b/src/it/skip-snapshot-jar/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -60,22 +60,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/skip/pom.xml b/src/it/skip/pom.xml index 0b50d387..652b3080 100644 --- a/src/it/skip/pom.xml +++ b/src/it/skip/pom.xml @@ -42,7 +42,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -55,22 +55,17 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 - - - org.apache.maven.plugins - maven-site-plugin - 2.0-beta-5 + @mavenSurefirePluginVersion@ diff --git a/src/it/snapshot-jar/pom.xml b/src/it/snapshot-jar/pom.xml index bd215e05..899b5832 100644 --- a/src/it/snapshot-jar/pom.xml +++ b/src/it/snapshot-jar/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,22 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-jar-plugin - 2.1 + @mavenJarPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + @mavenSurefirePluginVersion@ diff --git a/src/it/snapshot-pom/pom.xml b/src/it/snapshot-pom/pom.xml index 735559d7..5ff795c7 100644 --- a/src/it/snapshot-pom/pom.xml +++ b/src/it/snapshot-pom/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + @mavenCompilerPluginVersion@ org.apache.maven.plugins @@ -57,22 +57,17 @@ under the License. org.apache.maven.plugins maven-install-plugin - 2.2 + @mavenInstallPluginVersion@ org.apache.maven.plugins maven-resources-plugin - 2.2 + @mavenResourcesPluginVersion@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 - - - org.apache.maven.plugins - maven-site-plugin - 2.0-beta-5 + @mavenSurefirePluginVersion@ 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 8fc876a4..00000000 --- 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 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 null. - * @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 checksums = ChecksumUtils.calc(file, CHECKSUM_ALGORITHMS); - for (Map.Entry 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); - } - } - } -}