This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 405c587503 Use dedicated release properties file for Maven
405c587503 is described below
commit 405c587503e3cc1cc49081078731e4cedabba54d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 14:42:36 2022 +0100
Use dedicated release properties file for Maven
Align version generation with 8.5.x
---
build.xml | 29 ++++++++++++++++++++++++++---
res/maven/mvn-pub.xml | 1 +
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 92c0c5fd53..3e750e42d0 100644
--- a/build.xml
+++ b/build.xml
@@ -2691,10 +2691,33 @@ ant.tstamp.now.iso=${tstamp.iso.release}
#
# Release Manager: ${release.asfusername}
</echo>
- <echo file="res/maven/mvn.properties">
-asf.ldap.username=${release.asfusername}
+ <echo file="res/maven/mvn.properties.release">#
-----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+
+# This file was auto-generated by the pre-release Ant target
+
+# Remove version-suffix to from the version since this is not a development
release.
+maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}
+
+# Re-use the same GPG executable
gpg.exec=${gpg.exec}
-maven.asf.release.deploy.version=${version}
+
+# Set the user name to use to upload the artefacts to Nexus
+asf.ldap.username=${release.asfusername}
</echo>
</target>
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 0fbde1b91c..8327636e95 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -21,6 +21,7 @@
xmlns:unless="ant:unless">
<property file="${basedir}/mvn.properties"/>
+ <property file="${basedir}/mvn.properties.release"/>
<property file="${basedir}/mvn.properties.default"/>
<property name="local.repo" value="${user.home}/.m2/repository"/>
<property name="aether.checksums.algorithms"
value="MD5,SHA-1,SHA-256,SHA-512"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
