This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push: new 02dec739a3 Add some trivial build updates (#3702) 02dec739a3 is described below commit 02dec739a319baafcb21f619177251af4d7f2fb7 Author: Christopher Tubbs <ctubb...@apache.org> AuthorDate: Thu Aug 17 15:18:22 2023 -0400 Add some trivial build updates (#3702) * Remove unused file * Update regex to filter out alpha/beta when using versions plugin * Remove unused HelpMojo exception * Bump sortpom and checkstyle versions to latest * Move release candidate build script to build script directory --- minicluster/minicluster.properties | 31 ---------------------- pom.xml | 8 +++--- .../build/create-release-candidate.sh | 10 ++++--- 3 files changed, 10 insertions(+), 39 deletions(-) diff --git a/minicluster/minicluster.properties b/minicluster/minicluster.properties deleted file mode 100644 index a6395099cc..0000000000 --- a/minicluster/minicluster.properties +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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 -# -# https://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. -# - -useMiniDFS=true -rootPassword=secret -instanceName=testInstance -numTServers=1 -zooKeeperPort=3191 -jdwpEnabled=true -zooKeeperMemory=128M -tserverMemory=256M -managerMemory=128M -defaultMemory=256M -shutdownPort=4446 -site.instance.secret=HUSH diff --git a/pom.xml b/pom.xml index cb923db522..033dc81abc 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <!-- surefire/failsafe plugin option --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <!-- versions-maven-plugin ignore patterns for snapshots, alpha, beta, milestones, and release candidates --> - <maven.version.ignore>.+-SNAPSHOT,(?i).*(alpha|beta)[0-9]*,(?i).*[.-](m|rc)[0-9]+</maven.version.ignore> + <maven.version.ignore>.+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+</maven.version.ignore> <minimalJavaBuildVersion>11</minimalJavaBuildVersion> <minimalMavenBuildVersion>3.6.0</minimalMavenBuildVersion> <!-- timestamp for reproducible outputs, updated on release by the release plugin --> @@ -770,7 +770,7 @@ <plugin> <groupId>com.github.ekryd.sortpom</groupId> <artifactId>sortpom-maven-plugin</artifactId> - <version>3.2.1</version> + <version>3.3.0</version> <configuration> <createBackupFile>false</createBackupFile> <expandEmptyElements>false</expandEmptyElements> @@ -1174,13 +1174,13 @@ </checkstyleRules> <violationSeverity>warning</violationSeverity> <includeTestSourceDirectory>true</includeTestSourceDirectory> - <excludes>**/thrift/*.java,**/proto/*.java,**/HelpMojo.java</excludes> + <excludes>**/thrift/*.java,**/proto/*.java</excludes> </configuration> <dependencies> <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>10.12.1</version> + <version>10.12.2</version> </dependency> </dependencies> <executions> diff --git a/assemble/build.sh b/src/build/create-release-candidate.sh similarity index 98% rename from assemble/build.sh rename to src/build/create-release-candidate.sh index c0bb5786a8..d9ad0548ca 100755 --- a/assemble/build.sh +++ b/src/build/create-release-candidate.sh @@ -20,6 +20,8 @@ cd "$(dirname "$0")/.." || exit 1 scriptname=$(basename "$0") +projectroot="$(git rev-parse --show-toplevel)" || exit 1 +cd "$projectroot" || exit 1 export tlpName=accumulo export projName="$tlpName" export projNameLong="Apache ${projName^}" @@ -430,17 +432,17 @@ createReleaseCandidate() { [[ $numBin == "1" ]] && binSha=$(sha512sum target/checkout/**/"$projName-$ver-bin.tar.gz" | cut -f1 -d" ") # continue to creating email notification - echo "$(red Running)" "$(yellow "$scriptname" --create-email "$ver" "$rc")" + echo "$(red Running)" "$(yellow "$scriptname" --email "$ver" "$rc")" createEmail "$ver" "$rc" "" "$srcSha" "$binSha" } SELECTED_FINGERPRINT="" -if [[ $1 == '--create-release-candidate' ]]; then +if [[ $1 == '--create' ]]; then shift createReleaseCandidate "$@" -elif [[ $1 == '--create-email' ]]; then +elif [[ $1 == '--email' ]]; then shift createEmail "$@" else - fail "Missing one of: $(red --create-release-candidate), $(red --create-email)" + fail "Missing one of: $(red --create), $(red --email)" fi