This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git

commit 1dcede308e5da1c7a26472dd4ca85c9c6ae5d1e7
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 4 18:02:15 2026 +0000

    Run the MDEPLOY-184 IT and fold the multithread IT into deploy-at-end-pass
    
    Fixes #743
---
 .../module1/pom.xml                                |  25 ------
 .../module2/pom.xml                                |  26 ------
 .../MDEPLOY-169_deploy-at-end-multithread/pom.xml  | 100 ---------------------
 .../verify.groovy                                  |  31 -------
 .../pom.xml                                        |  34 +++++++
 .../invoker.properties                             |   6 +-
 src/it/deploy-at-end-pass/verify.groovy            |   7 ++
 7 files changed, 46 insertions(+), 183 deletions(-)

diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml 
b/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml
deleted file mode 100644
index f36c443..0000000
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/module1/pom.xml
+++ /dev/null
@@ -1,25 +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>
-
-  <parent>
-    <groupId>org.apache.maven.its.mdeploy-169</groupId>
-    <artifactId>multithread</artifactId>
-    <version>1.0</version>
-  </parent>
-  <artifactId>module1</artifactId>
-
-</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml 
b/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml
deleted file mode 100644
index 2373f39..0000000
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/module2/pom.xml
+++ /dev/null
@@ -1,26 +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>
-
-  <parent>
-    <groupId>org.apache.maven.its.mdeploy-169</groupId>
-    <artifactId>multithread</artifactId>
-    <version>1.0</version>
-  </parent>
-  <artifactId>module2</artifactId>
-  <packaging>pom</packaging>
-
-</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml 
b/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
deleted file mode 100644
index af8d8c2..0000000
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
+++ /dev/null
@@ -1,100 +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.mdeploy-169</groupId>
-  <artifactId>multithread</artifactId>
-  <version>1.0</version>
-  <packaging>pom</packaging>
-
-  <description>
-    Tests deployment at end with two threads.
-  </description>
-
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
-
-  <distributionManagement>
-    <repository>
-      <id>it</id>
-      <url>file:///${basedir}/target/repo</url>
-    </repository>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>@mavenCompilerPluginVersion@</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>@project.version@</version>
-        <configuration>
-          <deployAtEnd>true</deployAtEnd>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>@mavenInstallPluginVersion@</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>@mavenJarPluginVersion@</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>@mavenResourcesPluginVersion@</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>@mavenSourcePluginVersion@</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>@mavenSurefirePluginVersion@</version>
-      </plugin>
-    </plugins>
-  </build>
-
-  <modules>
-    <module>module1</module>
-    <module>module2</module>
-  </modules>
-</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/verify.groovy 
b/src/it/MDEPLOY-169_deploy-at-end-multithread/verify.groovy
deleted file mode 100644
index 43461cb..0000000
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/verify.groovy
+++ /dev/null
@@ -1,31 +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.
- */
-
-rootRepo = new File( basedir, "target/repo" )
-module1Repo = new File( basedir, "module1/target/repo" )
-module2Repo = new File( basedir, "module2/target/repo" )
-
-if (mavenVersion.startsWith('4.')) {
-    // Maven 4 deploys in the root target directory, as defined in the root POM
-    module1Repo = module2Repo = rootRepo
-}
-
-assert new File( rootRepo, 
"org/apache/maven/its/mdeploy-169/multithread/1.0/multithread-1.0.pom" 
).exists()
-assert new File( module1Repo, 
"org/apache/maven/its/mdeploy-169/module1/1.0/module1-1.0.pom" ).exists()
-assert new File( module2Repo, 
"org/apache/maven/its/mdeploy-169/module2/1.0/module2-1.0.pom" ).exists()
diff --git a/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/pom.xml 
b/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/pom.xml
new file mode 100644
index 0000000..39e9243
--- /dev/null
+++ b/src/it/MDEPLOY-184_deployfile-with-javadoc-and-sources/pom.xml
@@ -0,0 +1,34 @@
+<?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.184</groupId>
+  <artifactId>project</artifactId>
+  <version>1.0</version>
+
+  <description>
+    Tests the deployment of the sources and javadoc jars given by parameters 
(MDEPLOY-184). The invoker only runs
+    directories with a pom.xml, so this project exists for that; the deployed 
artifact is described by
+    path/to/pom.xml and test.properties.
+  </description>
+</project>
diff --git a/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties 
b/src/it/deploy-at-end-pass/invoker.properties
similarity index 70%
rename from src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
rename to src/it/deploy-at-end-pass/invoker.properties
index 50360fc..d999b10 100644
--- a/src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
+++ b/src/it/deploy-at-end-pass/invoker.properties
@@ -14,4 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-invoker.goals = clean deploy -T2
+
+# The first run deploys at the end of a serial build, the second one with two 
threads (MDEPLOY-169). The second
+# run uses its own repository, since the first one has already filled the 
repository from the POM.
+invoker.goals.1 = deploy
+invoker.goals.2 = clean deploy -T2 
-DaltDeploymentRepository=parallel::file:target/parallel-repo
diff --git a/src/it/deploy-at-end-pass/verify.groovy 
b/src/it/deploy-at-end-pass/verify.groovy
index 8db4490..a2cdb3c 100644
--- a/src/it/deploy-at-end-pass/verify.groovy
+++ b/src/it/deploy-at-end-pass/verify.groovy
@@ -30,3 +30,10 @@ assert buildLog.text.contains( "[INFO] Deferring deploy for 
org.apache.maven.its
 // Last module does not emit this misleading message, as it IS "the end", not 
deferring anymore
 //assert buildLog.text.contains( "[INFO] Deferring deploy for 
org.apache.maven.its.deploy.dae.pass:module3:1.0 at end" )
 
+// second run (-T2, MDEPLOY-169): every project that deploys at the end 
reached the alternative repository
+parallelRepo = new File( basedir, 
"target/parallel-repo/org/apache/maven/its/deploy/dae/pass" )
+assert new File( parallelRepo, "dae/1.0/dae-1.0.pom" ).exists()
+assert new File( parallelRepo, "module1/1.0/module1-1.0.pom" ).exists()
+assert new File( parallelRepo, "module1/1.0/module1-1.0.jar" ).exists()
+assert new File( parallelRepo, "module3/1.0/module3-1.0.pom" ).exists()
+assert new File( parallelRepo, "module3/1.0/module3-1.0.jar" ).exists()

Reply via email to