This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1053
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 5b8a82e6c014c4f38b0e8663f42e47ddf43532fb
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Fri Nov 5 17:37:36 2021 +0100
- Populate scm info from all modules
Previously scm information was only detected in execution root
---
.../prepare/MRELEASE-1053/module-a/pom.xml | 39 ++++++++++++++
.../apache/maven/plugin/release/module/a/App.java | 32 ++++++++++++
.../maven/plugin/release/module/a/AppTest.java | 57 +++++++++++++++++++++
.../prepare/MRELEASE-1053/module-parent/pom.xml | 59 ++++++++++++++++++++++
.../src/it/projects/prepare/MRELEASE-1053/pom.xml | 37 ++++++++++++++
.../projects/prepare/MRELEASE-1053/verify.groovy | 31 ++++++++++++
.../plugins/release/AbstractScmReleaseMojo.java | 2 +-
7 files changed, 256 insertions(+), 1 deletion(-)
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
new file mode 100644
index 0000000..19b6018
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.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.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.maven.plugin.release</groupId>
+ <artifactId>mrelease-1053-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../module-parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release</groupId>
+ <artifactId>module-a</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
new file mode 100644
index 0000000..05ca6ec
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
new file mode 100644
index 0000000..ca41b5f
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
new file mode 100644
index 0000000..b882a02
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
@@ -0,0 +1,59 @@
+<?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/maven-v4_0_0.xsd";
child.project.url.inherit.append.path="false">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release</groupId>
+ <artifactId>mrelease-1053-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm child.scm.connection.inherit.append.path="false"
child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="true">
+ <url>http://localhost/myscm/${project.scm.tag}</url>
+
<connection>scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/${project.scm.tag}/</connection>
+
<developerConnection>scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/${project.scm.tag}/</developerConnection>
+ <tag>trunk</tag>
+ </scm>
+
+ <properties>
+ <maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
+ <maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/pom.xml
new file mode 100644
index 0000000..4860d42
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/pom.xml
@@ -0,0 +1,37 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release</groupId>
+ <artifactId>mrelease-1053</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <url>https://issues.apache.org/jira/browse/MRELEASE-1053</url>
+ <parent>
+ <groupId>org.apache.maven.plugin.release</groupId>
+ <artifactId>mrelease-1053-parent</artifactId>
+ <relativePath>module-parent/pom.xml</relativePath>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modules>
+ <module>module-a</module>
+ <module>module-parent</module>
+ </modules>
+</project>
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
new file mode 100644
index 0000000..f496ed4
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+// check parent project
+def project = new XmlSlurper().parse( new File( new File ( basedir,
'module-parent' ), 'pom.xml.next' ) )
+assert project.version.text() == '1.1-SNAPSHOT'
+assert project.scm.url.text() == 'http://localhost/myscm/${project.scm.tag}'
+
+// check execution root project
+project = new XmlSlurper().parse( new File ( basedir, 'pom.xml.next' ) )
+assert 0 == project.scm.size() // scm element must not exist in reactor root
+
+// check module-a project
+project = new XmlSlurper().parse( new File( new File ( basedir, 'module-a' ),
'pom.xml.next' ) )
+assert 0 == project.scm.size() // scm element must not exist in module
diff --git
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
index 6804603..f7113bb 100644
---
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
+++
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
@@ -175,7 +175,7 @@ public abstract class AbstractScmReleaseMojo
String projectId =
ArtifactUtils.versionlessKey( reactorProject.getGroupId(),
reactorProject.getArtifactId() );
- descriptor.addOriginalScmInfo( projectId, buildScm( project )
);
+ descriptor.addOriginalScmInfo( projectId, buildScm(
reactorProject ) );
}
}
