Skip to content

Commit

Permalink
Merge 1d2a960 into 6f8e814
Browse files Browse the repository at this point in the history
  • Loading branch information
davecromberge committed May 10, 2022
2 parents 6f8e814 + 1d2a960 commit c33c382
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 17 deletions.
10 changes: 5 additions & 5 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Apache DataSketches Memory
Copyright 2022 - The Apache Software Foundation

Copyright 2021 - The Apache Software Foundation

Copyright 2015-2018 Yahoo
Copyright 2019 Verizon Media
Copyright 2015-2018 Yahoo Inc.
Copyright 2019-2020 Verizon Media
Copyright 2021 Yahoo Inc.

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

Prior to moving to ASF, the software for this project was developed at
Yahoo (now Verizon Media) (https://developer.yahoo.com).
Yahoo Inc. (https://developer.yahoo.com).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,15 @@ For example, if the project base directory is `/src/datasketches-memory`;

To run the script for a release version:

./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.0.0 /src/datasketches-memory
./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.1.0 /src/datasketches-memory

To run the script for a snapshot version:

./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.1.0-SNAPSHOT /src/datasketches-memory
./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.2.0-SNAPSHOT /src/datasketches-memory

To run the script for an RC version:

./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.0.0-RC1 /src/datasketches-memory
./tools/scripts/compile-package-jar.sh $JAVA_HOME 2.1.0-RC1 /src/datasketches-memory

Note that the script does **not** use the _Git Version Tag_ to adjust the working copy to a remote tag - it is expected that the user has a pristine copy of the desired branch/tag available **before** using the script.

Expand Down
5 changes: 2 additions & 3 deletions datasketches-memory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->

<!-- Test -->
<!-- Version 7.4.0 fails to locate jquery.min.js for reporting on debian systems -->
<testng.version>7.1.0</testng.version>
<testng.version>7.5</testng.version>

<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
Expand All @@ -116,7 +115,7 @@ under the License.

<!-- Maven Plugins -->
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> <!-- overrides parent -->
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> <!-- overrides parent -->
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version> <!-- overrides parent -->
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
<maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version> <!-- overrides parent -->
Expand Down
9 changes: 4 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->

<!-- Test -->
<!-- Version 7.4.0 fails to locate jquery.min.js for reporting on debian systems -->
<testng.version>7.1.0</testng.version>
<testng.version>7.5</testng.version>

<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
Expand All @@ -123,10 +122,10 @@ under the License.
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <!-- overrides parent -->
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version> <!-- overrides parent -->
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> <!-- overrides parent -->
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> <!-- overrides parent -->
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version> <!-- overrides parent -->
<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version> <!-- overrides parent -->
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version> <!-- overrides parent -->
<maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version> <!-- overrides parent -->
<maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version> <!-- overrides parent -->
<maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent -->
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/compile-package-jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# Example tag for Release Candidate: 1.0.0-RC1
# Example tag for Release : 1.0.0
# \$3 = absolute path of project.basedir
# For example: $ <this script>.sh $JAVA_HOME 2.0.0-RC1 .
# For example: $ <this script>.sh $JAVA_HOME 2.1.0 .

if [ -z "$1" ]; then echo "Missing JDK home"; exit 1; fi
if [ -z "$2" ]; then echo "Missing Git Tag"; exit 1; fi
Expand Down

0 comments on commit c33c382

Please sign in to comment.