You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/09 13:11:52 UTC
[tomcat] branch main updated: Consistent file naming and add ALv2 header
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 30c85ad786 Consistent file naming and add ALv2 header
30c85ad786 is described below
commit 30c85ad7861147d9609cdb1bd616ea9da46d107c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 14:11:46 2022 +0100
Consistent file naming and add ALv2 header
The build.properties.release file will be added to the tag so give it an
ALv2 header so RAT doesn't complain.
---
build.xml | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 82ea7daec1..f7be32adf9 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@
<!-- property values you may customize. -->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
- <property file="build-release.properties"/>
+ <property file="build.properties.release"/>
<property file="build.properties.default"/>
<!-- Check Ant Version -->
@@ -316,6 +316,7 @@
<include name="**/*.project"/>
<include name="**/*.properties"/>
<include name="**/*.properties.default"/>
+ <include name="**/*.properties.release"/>
<include name="**/*.shtml"/>
<include name="**/*.svg"/>
<include name="**/*.tag"/>
@@ -871,7 +872,6 @@
<exclude name="test/webapp/jsp/encoding/**"/>
<!-- Exclude developer specific local files -->
<exclude name="build.properties" />
- <exclude name="build-release.properties" />
<exclude name="res/maven/mvn.properties" />
</fileset>
<fileset dir="modules/jdbc-pool" >
@@ -2643,11 +2643,28 @@ skip.installer property in build.properties" />
<input message="Enter ASF username" addproperty="release.asfusername" defaultValue="${user.name}" />
</target>
- <target name="pre-release" depends="-pre-release-lone-target-check, -pre-release-read-asf-username" description="Prepares for a release build by writing build-release.properties which contains information about the release-build environment.">
+ <target name="pre-release" depends="-pre-release-lone-target-check, -pre-release-read-asf-username"
+ description="Prepares for a release build by writing build.properties.release which contains information about the release-build environment.">
<tstamp>
<format pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" property="now-readable" timezone="UTC" />
</tstamp>
- <echo file="build-release.properties">
+ <echo file="build.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.
+# -----------------------------------------------------------------------------
+
# These ant.tstamp properties specify the build-timestamp for repeatable builds.
ant.tstamp.now.iso=${now-readable}
# This is the ASF user who is the Release Manager for this release.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org