This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hadoop-release-support.git
commit 9ff838d3a8a19e24866c70c5312010a818db3d2d
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Fri Feb 23 18:02:48 2024 +0000
use -Drelease=X.Y.Z for the release property file to be loaded
release.properties contains the release version to use; it can be
set on the command line too. This is used to then derive the value
of release.info.file.
---
README.md | 15 ++++++++++++---
build.xml | 6 ++++--
pom.xml | 5 +++++
release.properties | 4 ++--
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index cb4fac6..30bfdbf 100644
--- a/README.md
+++ b/README.md
@@ -97,9 +97,18 @@ path to the latest release being worked on in this branch.
2. It is read after `build.properties`
```properties
-release.info.file=src/releases/release-info-3.4.0.properties
+release=3.4.0
```
+Ant uses to to set the property `release.info.file` to the path
+`src/releases/release-info-${release}.properties`
+
+```properties
+release.info.file=src/releases/release-info-3.4.0.prpoperties
+```
+
+This is then loaded.
+
### Release info file `src/releases/release-info-*.properties`
Definition files of base properties for the active RC.
@@ -147,7 +156,7 @@ Update the value of `release.info.file` in
`/release.properties` to
point to the newly created file.
```properties
-release.info.file=src/releases/release-info-X.Y.Z.properties
+release=X.Y.Z
```
#### Switching to a new release on the command line
@@ -156,7 +165,7 @@ You can switch to a new release on the command line; this
is needed when
validating PRs.
```bash
-ant -Drelease.info.file=src/releases/release-info-3.4.1.properties
+ant -Drelease=3.4.1
```
### set up `build.properties`
diff --git a/build.xml b/build.xml
index 45fc01e..b4d194e 100644
--- a/build.xml
+++ b/build.xml
@@ -104,10 +104,12 @@
<!--
Load the release.properties file
- This MUST contain an absolute/relative path to the release-info
- properties file if not set in build.properties.
+ This MUST contain a property "release" which is matched
+ by a file src/releases/release-info-${release}.properties
-->
<loadproperties srcFile="release.properties"/>
+ <property name="release.info.file"
+ location="src/releases/release-info-${release}.properties"/>
<require p="release.info.file"/>
<!-- and load the file it references.-->
<loadproperties srcFile="${release.info.file}"/>
diff --git a/pom.xml b/pom.xml
index c9f697d..5942ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,6 +236,11 @@
<artifactId>hadoop-yarn-common</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/release.properties b/release.properties
index 56de776..3aeb43c 100644
--- a/release.properties
+++ b/release.properties
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# File to git-managed release info.
-release.info.file=src/releases/release-info-3.4.0.properties
+# Version of the git-managed release info file
+release=3.4.0
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
