This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
The following commit(s) were added to refs/heads/master by this push:
new 07a742b8 Fix some release related errors when executing 'mvn
release:prepare -DdryRun=true'
07a742b8 is described below
commit 07a742b8bd6ba8c2bbc30268eaaf55191d3a0218
Author: Robert Lazarski <[email protected]>
AuthorDate: Thu Nov 28 06:48:42 2024 -1000
Fix some release related errors when executing 'mvn release:prepare
-DdryRun=true'
---
modules/distribution/pom.xml | 7 ++
modules/rampart-core/pom.xml | 7 ++
modules/rampart-integration/pom.xml | 7 ++
modules/rampart-mar/pom.xml | 7 ++
modules/rampart-policy/pom.xml | 7 ++
modules/rampart-samples/pom.xml | 7 ++
modules/rampart-tests/pom.xml | 7 ++
modules/rampart-testutils/pom.xml | 7 ++
modules/rampart-trust-mar/pom.xml | 7 ++
modules/rampart-trust/pom.xml | 7 ++
pom.xml | 163 +++++++++++++++++++++++++++---------
11 files changed, 192 insertions(+), 41 deletions(-)
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 9a255ed1..4d3b74c6 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -33,6 +33,13 @@
<packaging>pom</packaging>
<name>Rampart - Distribution</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/modules/rampart-core/pom.xml b/modules/rampart-core/pom.xml
index 9f3fd23d..615ed99a 100644
--- a/modules/rampart-core/pom.xml
+++ b/modules/rampart-core/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Core</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index bce3de3e..3fe13e0f 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Integration</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/modules/rampart-mar/pom.xml b/modules/rampart-mar/pom.xml
index 089ff7ca..4d28c0f3 100644
--- a/modules/rampart-mar/pom.xml
+++ b/modules/rampart-mar/pom.xml
@@ -34,6 +34,13 @@
<packaging>mar</packaging>
<name>Rampart - Mar</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/modules/rampart-policy/pom.xml b/modules/rampart-policy/pom.xml
index 0d38319f..ef643a73 100644
--- a/modules/rampart-policy/pom.xml
+++ b/modules/rampart-policy/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Policy</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
diff --git a/modules/rampart-samples/pom.xml b/modules/rampart-samples/pom.xml
index f48bc404..fc79a6fd 100644
--- a/modules/rampart-samples/pom.xml
+++ b/modules/rampart-samples/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Samples</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index 62970a07..6cece735 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Test Suite</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
diff --git a/modules/rampart-testutils/pom.xml
b/modules/rampart-testutils/pom.xml
index 8f217045..1e9dd7c1 100644
--- a/modules/rampart-testutils/pom.xml
+++ b/modules/rampart-testutils/pom.xml
@@ -30,6 +30,13 @@
<artifactId>rampart-testutils</artifactId>
<packaging>jar</packaging>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
diff --git a/modules/rampart-trust-mar/pom.xml
b/modules/rampart-trust-mar/pom.xml
index c5de97e1..105a0ca8 100644
--- a/modules/rampart-trust-mar/pom.xml
+++ b/modules/rampart-trust-mar/pom.xml
@@ -35,6 +35,13 @@
<packaging>mar</packaging>
<name>Rampart - Trust-Mar</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml
index 5f5e171f..ed2a5313 100644
--- a/modules/rampart-trust/pom.xml
+++ b/modules/rampart-trust/pom.xml
@@ -34,6 +34,13 @@
<packaging>jar</packaging>
<name>Rampart - Trust</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
+
<build>
<plugins>
<plugin>
diff --git a/pom.xml b/pom.xml
index 4b2e34c8..7e57d76d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,28 +147,26 @@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.11.1</version>
+ <configuration>
+ <source>8</source>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <doclint>none</doclint>
+ <quiet>true</quiet>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <preparationGoals>clean install</preparationGoals>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${axis2.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.6.0</version>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.21.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -177,40 +175,91 @@
<dependencies>
<dependency>
<groupId>org.apache.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>4.0.23</version>
- <type>pom</type>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy.version}</version>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.7.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.4.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ </plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.3</version>
</plugin>
<plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-repo-maven-plugin</artifactId>
- <version>${axis2.version}</version>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.4.2</version>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.21.0</version>
- <configuration>
- <!-- Required by maven-scm-publish-plugin -->
- <skipDeploy>true</skipDeploy>
- </configuration>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-tools.version}</version>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.7.1</version>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <version>${maven-plugin-tools.version}</version>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.11.1</version>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.5.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.4.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.6.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>1.8.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${axis2.version}</version>
</plugin>
<plugin>
<groupId>com.github.veithen.alta</groupId>
@@ -256,12 +305,42 @@
</goals>
<configuration>
<scripts>
- <script>
- <!-- Skip Jacoco if necessary -->
- if (project.packaging == 'pom' ||
project.properties['skipTests'] == 'true') {
- project.properties['skipJacoco'] =
'true'
+ <script><![CDATA[
+ import java.io.File
+
+ // Create the temporary directory
specified in the surefire configuration
+ new File(project.build.directory,
'tmp').mkdirs()
+
+ // Skip maven-invoker-plugin if tests are
skipped.
+ if
(session.systemProperties['maven.test.skip'] == 'true' ||
session.systemProperties['skipTests'] == 'true') {
+ project.properties['invoker.skip'] =
'true'
}
- </script>
+ ]]></script>
+ </scripts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>check-project-metadata</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script><![CDATA[
+ // Ensure that the <scm> element is
present and correctly populated. This prevents
+ // maven-release-plugin from adding an
<scm> element in a location that is then rejected by
+ // tidy-maven-plugin.
+ if
(!project.scm.url.contains("https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary";))
{
+ throw new Error('project.scm.url not
set correctly: ' + project.scm.url)
+ }
+ if (project.scm.connection !=
"scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git";) {
+ throw new
Error('project.scm.connection not set correctly: ' + project.scm.connection)
+ }
+ if (project.scm.developerConnection !=
"scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git";) {
+ throw new
Error('project.scm.developerConnection not set correctly')
+ }
+ ]]></script>
</scripts>
</configuration>
</execution>
@@ -274,9 +353,10 @@
<configuration>
<scripts>
<script>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['release_date'] =
MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
+ import java.time.*
+ import java.time.format.*
+
+ project.properties['release_date'] =
DateTimeFormatter.ofPattern("MMMM dd,
yyyy").withZone(ZoneId.of("Z")).format(OffsetDateTime.parse(project.properties['project.build.outputTimestamp']).toInstant())
project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
project.properties['skipSiteSite'] =
String.valueOf(!new File(project.basedir, 'src/site/site.xml').exists())
</script>
@@ -763,6 +843,7 @@
<jacoco.version>0.8.12</jacoco.version>
<slf4j.version>2.0.16</slf4j.version>
+ <groovy.version>4.0.24</groovy.version>
</properties>
<pluginRepositories>
