(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 0739f7ee6d4db2931d855abefea00e70a32ada86 Merge: 9d80b65f0e a0c7e4ae36 Author: Daniel Roberts AuthorDate: Mon Feb 12 19:18:36 2024 + Merge branch 'main' into elasticity .../org/apache/accumulo/core/conf/Property.java| 4 - .../main/java/org/apache/accumulo/gc/GCRun.java| 10 --- .../accumulo/gc/GarbageCollectionAlgorithm.java| 4 +- .../accumulo/gc/GarbageCollectionEnvironment.java | 10 +-- .../apache/accumulo/gc/GarbageCollectionTest.java | 88 -- 5 files changed, 34 insertions(+), 82 deletions(-)
(accumulo) branch main updated: Makes inuse GC deletion default behavior (#4252)
This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new a0c7e4ae36 Makes inuse GC deletion default behavior (#4252)
a0c7e4ae36 is described below
commit a0c7e4ae36c68df418103118fe0dde367b8bb94c
Author: Daniel Roberts
AuthorDate: Mon Feb 12 14:09:38 2024 -0500
Makes inuse GC deletion default behavior (#4252)
Removes the property allowing disabling of the in-use GC candidate
deletion feature
---
.../org/apache/accumulo/core/conf/Property.java| 4 -
.../main/java/org/apache/accumulo/gc/GCRun.java| 10 ---
.../accumulo/gc/GarbageCollectionAlgorithm.java| 4 +-
.../accumulo/gc/GarbageCollectionEnvironment.java | 10 +--
.../apache/accumulo/gc/GarbageCollectionTest.java | 88 --
5 files changed, 34 insertions(+), 82 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 9acce283cd..497486cb18 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -794,10 +794,6 @@ public enum Property {
"The listening port for the garbage collector's monitor service.",
"1.3.5"),
GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT,
"The number of threads used to delete RFiles and write-ahead logs.",
"1.3.5"),
- GC_REMOVE_IN_USE_CANDIDATES("gc.remove.in.use.candidates", "true",
PropertyType.BOOLEAN,
- "GC will remove deletion candidates that are in-use from the metadata
location. "
- + "This is expected to increase the speed of subsequent GC runs.",
- "2.1.3"),
GC_SAFEMODE("gc.safemode", "false", PropertyType.BOOLEAN,
"Provides listing of files to be deleted but does not delete any
files.", "2.1.0"),
GC_USE_FULL_COMPACTION("gc.post.metadata.action", "flush",
PropertyType.GC_POST_ACTION,
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
index c210b58256..f02b85634e 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
@@ -472,16 +472,6 @@ public class GCRun implements GarbageCollectionEnvironment
{
return context.getConfiguration().getBoolean(Property.GC_SAFEMODE);
}
- /**
- * Checks if InUse Candidates can be removed.
- *
- * @return value of {@link Property#GC_REMOVE_IN_USE_CANDIDATES}
- */
- @Override
- public boolean canRemoveInUseCandidates() {
-return
context.getConfiguration().getBoolean(Property.GC_REMOVE_IN_USE_CANDIDATES);
- }
-
/**
* Moves a file to trash. If this garbage collector is not using trash, this
method returns false
* and leaves the file alone. If the file is missing, this method returns
false as opposed to
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index ab9bff706e..eb6b8fe281 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -198,9 +198,7 @@ public class GarbageCollectionAlgorithm {
Set tableIdsAfter = gce.getCandidateTableIDs();
ensureAllTablesChecked(Collections.unmodifiableSet(tableIdsBefore),
Collections.unmodifiableSet(tableIdsSeen),
Collections.unmodifiableSet(tableIdsAfter));
-if (gce.canRemoveInUseCandidates()) {
- gce.deleteGcCandidates(candidateEntriesToBeDeleted,
GcCandidateType.INUSE);
-}
+gce.deleteGcCandidates(candidateEntriesToBeDeleted, GcCandidateType.INUSE);
}
private long removeBlipCandidates(GarbageCollectionEnvironment gce,
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index 1d2b1e6391..3c373e92b7 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -28,7 +28,6 @@ import java.util.SortedMap;
import java.util.stream.Stream;
import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.gc.GcCandidate;
import org.apache.accumulo.core.gc.Reference;
@@ -48,13 +47,6 @@ public interface GarbageCollectionEnvironment {
*/
Iterator getCandidates() throws TableNotFoundException;
- /**
- * Used for determining if deletion of InUse candidates is enabled.
- *
- * @return value
(accumulo) branch elasticity updated (9d80b65f0e -> 0739f7ee6d)
This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 9d80b65f0e fixes clean shutdown bug in manager (#4248) add a0c7e4ae36 Makes inuse GC deletion default behavior (#4252) new 0739f7ee6d Merge branch 'main' into elasticity The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java| 4 - .../main/java/org/apache/accumulo/gc/GCRun.java| 10 --- .../accumulo/gc/GarbageCollectionAlgorithm.java| 4 +- .../accumulo/gc/GarbageCollectionEnvironment.java | 10 +-- .../apache/accumulo/gc/GarbageCollectionTest.java | 88 -- 5 files changed, 34 insertions(+), 82 deletions(-)
(accumulo) branch main updated: Replaced System.currentTimeMillis() with System.nanoTime() in DfsLogger (#4250)
This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new d91178f44c Replaced System.currentTimeMillis() with System.nanoTime()
in DfsLogger (#4250)
d91178f44c is described below
commit d91178f44cd00cbdc1f305675c9f36a36ab86d96
Author: Arbaaz Khan
AuthorDate: Mon Feb 12 15:49:44 2024 -0500
Replaced System.currentTimeMillis() with System.nanoTime() in DfsLogger
(#4250)
* Replaced System.currentTimeMillis() with System.nanoTime()
---
.../main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index c0ed0aed39..020144f9d9 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -20,6 +20,8 @@ package org.apache.accumulo.tserver.log;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_FINISH;
import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_START;
import static org.apache.accumulo.tserver.logger.LogEvents.DEFINE_TABLET;
@@ -172,7 +174,7 @@ public final class DfsLogger implements
Comparable {
}
}
-long start = System.currentTimeMillis();
+long start = System.nanoTime();
try {
if (shouldHSync.isPresent()) {
if (shouldHSync.orElseThrow()) {
@@ -186,9 +188,9 @@ public final class DfsLogger implements
Comparable {
} catch (IOException | RuntimeException ex) {
fail(work, ex, "synching");
}
-long duration = System.currentTimeMillis() - start;
-if (duration > slowFlushMillis) {
- log.info("Slow sync cost: {} ms, current pipeline: {}", duration,
+long duration = System.nanoTime() - start;
+if (duration > MILLISECONDS.toNanos(slowFlushMillis)) {
+ log.info("Slow sync cost: {} ms, current pipeline: {}",
NANOSECONDS.toMillis(duration),
Arrays.toString(getPipeLine()));
if (expectedReplication > 0) {
int current = expectedReplication;
(accumulo) branch elasticity updated (0739f7ee6d -> e375190772)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 0739f7ee6d Merge branch 'main' into elasticity add e375190772 fixes volume replacement failures (#4257) No new revisions were added by this update. Summary of changes: .../server/manager/state/TabletGoalState.java | 31 +++--- .../manager/state/TabletManagementIterator.java| 12 - .../accumulo/manager/TabletGroupWatcher.java | 4 +-- 3 files changed, 23 insertions(+), 24 deletions(-)
(accumulo-access) branch 1.0.0-rc2 deleted (was 157b185)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc2 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git was 157b185 [maven-release-plugin] prepare release rel/1.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(accumulo-access) branch 1.0.0-rc2-next deleted (was 4dc198f)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc2-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git was 4dc198f [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 4dc198f [maven-release-plugin] prepare for next development iteration discard 157b185 [maven-release-plugin] prepare release rel/1.0.0
(accumulo-access) branch main updated: Changes to rc script because we don't build a tarball (#41)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-access.git
The following commit(s) were added to refs/heads/main by this push:
new a8bc6a1 Changes to rc script because we don't build a tarball (#41)
a8bc6a1 is described below
commit a8bc6a12ee1bbb93bf927b722a5c5f270a6a5b1b
Author: Dave Marion
AuthorDate: Mon Feb 12 09:44:15 2024 -0500
Changes to rc script because we don't build a tarball (#41)
---
src/build/create-release-candidate.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/build/create-release-candidate.sh
b/src/build/create-release-candidate.sh
index d368630..a467e15 100755
--- a/src/build/create-release-candidate.sh
+++ b/src/build/create-release-candidate.sh
@@ -23,10 +23,10 @@ scriptname=$(basename "$0")
projectroot="$(git rev-parse --show-toplevel)" || exit 1
cd "$projectroot" || exit 1
export tlpName=accumulo
-export projName="${tlpName}-access"
+export projName="${tlpName}-Access"
export projNameLong="Apache ${projName^}"
export
stagingRepoPrefix="https://repository.apache.org/content/repositories/orgapache$tlpName;
-export srcQualifier="src"
+export srcQualifier="source-release"
export
relTestingUrl="https://$tlpName.apache.org/contributor/verifying-release;
export tagPrefix="rel/"
@@ -141,7 +141,7 @@ createEmail() {
local stagingrepo
[[ -n $3 ]] && stagingrepo=$3 || stagingrepo=$(prompter 'staging repository
number from https://repository.apache.org/#stagingRepositories' '[0-9]+')
local srcSha
- [[ -n $4 ]] && srcSha=$4 || srcSha=$(prompter 'SHA512 for source tarball'
'[0-9a-f]{128}')
+ [[ -n $4 ]] && srcSha=$4 || srcSha=$(prompter 'SHA512 for source release zip
file' '[0-9a-f]{128}')
local branch
branch=$ver-rc$rc
@@ -206,7 +206,7 @@ If this vote passes, a gpg-signed tag will be created using:
$(green "$commit")
Staging repo: $(green "$stagingRepoPrefix-$stagingrepo")
-Source (official release artifact): $(green
"$stagingRepoPrefix-$stagingrepo/org/apache/$tlpName/$projName/$ver/$projName-$ver-$srcQualifier.tar.gz")
+Source (official release artifact): $(green
"$stagingRepoPrefix-$stagingrepo/org/apache/$tlpName/$projName/$ver/$projName-$ver-$srcQualifier.zip")
Append ".asc" to download the cryptographic signature for a given artifact.
(You can also append ".sha1" or ".md5" instead in order to verify the checksums
@@ -215,10 +215,10 @@ generated by Maven to verify the integrity of the Nexus
repository staging area.
Signing keys are available at https://www.apache.org/dist/$tlpName/KEYS
(Expected fingerprint: $(green "$SELECTED_FINGERPRINT"))
-In addition to the tarballs and their signatures, the following checksum
+In addition to the zipfiles and their signatures, the following checksum
files will be added to the dist/release SVN area after release:
-$(yellow "$projName-$ver-$srcQualifier.tar.gz.sha512") will contain:
-SHA512 ($(green "$projName-$ver-$srcQualifier.tar.gz")) = $(yellow "$srcSha")
+$(yellow "$projName-$ver-$srcQualifier.zip.sha512") will contain:
+SHA512 ($(green "$projName-$ver-$srcQualifier.zip")) = $(yellow "$srcSha")
Issues and pull requests related to this release can be found at: $(green
"https://github.com/apache/accumulo-access/issues?q=milestone%3A$ver;)
@@ -413,11 +413,11 @@ createReleaseCandidate() {
fi
local numSrc
- numSrc=$(find target/checkout/ -type f -name
"$projName-$ver-source-release.tar.gz" | wc -l)
+ numSrc=$(find target/checkout/ -type f -name
"$projName-$ver-source-release.zip" | wc -l)
shopt -s globstar
local srcSha
srcSha=""
- [[ $numSrc == "1" ]] && srcSha=$(sha512sum
target/checkout/**/"$projName-$ver-source-release.tar.gz" | cut -f1 -d" ")
+ [[ $numSrc == "1" ]] && srcSha=$(sha512sum
target/checkout/**/"$projName-$ver-source-release.zip" | cut -f1 -d" ")
# continue to creating email notification
echo "$(red Running)" "$(yellow "$scriptname" --email "$ver" "$rc")"
(accumulo-access) 01/01: [maven-release-plugin] prepare release rel/1.0.0
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1.0.0-rc3 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git commit 276dfe1bfb3868812da5414d79f4d995bade9a36 Author: Dave Marion AuthorDate: Mon Feb 12 14:45:50 2024 + [maven-release-plugin] prepare release rel/1.0.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5edf059..e071f30 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-access - 1.0.0-SNAPSHOT + 1.0.0 Apache Accumulo Access Project Apache Accumulo Access is a library that provides the same functionality, semantics, and syntax as the Apache Accumulo ColumnVisibility and VisibilityEvaluator classes. This functionality is provided in a @@ -75,7 +75,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git -HEAD +rel/1.0.0 https://gitbox.apache.org/repos/asf?p=accumulo-access.git
(accumulo-access) branch 1.0.0-rc3 created (now 276dfe1)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc3 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git at 276dfe1 [maven-release-plugin] prepare release rel/1.0.0 This branch includes the following new commits: new 276dfe1 [maven-release-plugin] prepare release rel/1.0.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(accumulo-access) 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1.0.0-rc2-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git commit 4dc198f4c781b8f412465e1f50de0ac3b2db1fea Author: Dave Marion AuthorDate: Mon Feb 12 14:23:02 2024 + [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e071f30..508813e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-access - 1.0.0 + 1.0.1-SNAPSHOT Apache Accumulo Access Project Apache Accumulo Access is a library that provides the same functionality, semantics, and syntax as the Apache Accumulo ColumnVisibility and VisibilityEvaluator classes. This functionality is provided in a @@ -75,7 +75,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git -rel/1.0.0 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo-access.git
(accumulo-access) branch 1.0.0-rc2-next created (now 4dc198f)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc2-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git at 4dc198f [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 4dc198f [maven-release-plugin] prepare for next development iteration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(accumulo-access) branch 1.0.0-rc2 created (now 157b185)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc2 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git at 157b185 [maven-release-plugin] prepare release rel/1.0.0 No new revisions were added by this update.
(accumulo-access) branch main updated: Added description to pom, added initial release candidate script (#39)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-access.git
The following commit(s) were added to refs/heads/main by this push:
new f315807 Added description to pom, added initial release candidate
script (#39)
f315807 is described below
commit f315807509b26a1e1f46cb428d56d285853f805a
Author: Dave Marion
AuthorDate: Mon Feb 12 08:49:49 2024 -0500
Added description to pom, added initial release candidate script (#39)
---
pom.xml | 3 +
src/build/create-release-candidate.sh | 440 ++
2 files changed, 443 insertions(+)
diff --git a/pom.xml b/pom.xml
index d455c3e..0836585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,9 @@
accumulo-access
1.0.0-SNAPSHOT
Apache Accumulo Access Project
+ Apache Accumulo Access is a library that provides the same
functionality, semantics, and syntax
+ as the Apache Accumulo ColumnVisibility and VisibilityEvaluator classes.
This functionality is provided in a
+ standalong Java library that has no runtime dependencies.
https://accumulo.apache.org
The Apache Software Foundation
diff --git a/src/build/create-release-candidate.sh
b/src/build/create-release-candidate.sh
new file mode 100755
index 000..6fb94ad
--- /dev/null
+++ b/src/build/create-release-candidate.sh
@@ -0,0 +1,440 @@
+#! /usr/bin/env bash
+#
+# 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.
+#
+
+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}-access"
+export projNameLong="Apache ${projName^}"
+export
stagingRepoPrefix="https://repository.apache.org/content/repositories/orgapache$tlpName;
+export srcQualifier="src"
+export
relTestingUrl="https://$tlpName.apache.org/contributor/verifying-release;
+export tagPrefix="rel/"
+
+# check if running in a color terminal
+terminalSupportsColor() {
+ local c
+ c=$(tput colors 2>/dev/null) || c=-1
+ [[ -t 1 ]] && [[ $c -ge 8 ]]
+}
+terminalSupportsColor && doColor=1 || doColor=0
+
+color() {
+ local c
+ c=$1
+ shift
+ [[ $doColor -eq 1 ]] && echo -e "\\e[0;${c}m${*}\\e[0m" || echo "$@"
+}
+red() { color 31 "$@"; }
+green() { color 32 "$@"; }
+yellow() { color 33 "$@"; }
+
+fail() {
+ echo -e ' ' "$@"
+ exit 1
+}
+runLog() {
+ local o
+ o=$1 && shift && echo "$(green Running) $(yellow "$@" '>>' "$o")" && echo
Running "$*" >>"$o" && "$@" >>"$o"
+}
+run() { echo "$(green Running) $(yellow "$@")" && "$@"; }
+
+currentBranch() {
+ local b
+ b=$(git symbolic-ref -q HEAD) && echo "${b##refs/heads/}"
+}
+
+cacheGPG() {
+ # make sure gpg agent has key cached
+ # first clear cache, to reset timeouts (best attempt)
+ { hash gpg-connect-agent && gpg-connect-agent reloadagent /bye; } &>/dev/null
+ # determine fingerprint to use
+ until selectFingerprint; do
+red 'ERROR - Invalid selection'
+ done
+ local TESTFILE
+ TESTFILE=$(mktemp --tmpdir "${USER}-gpgTestFile-.txt")
+ [[ -r $TESTFILE ]] && gpg --local-user "$SELECTED_FINGERPRINT" --sign
"$TESTFILE" && rm -f "$TESTFILE" "$TESTFILE.gpg"
+}
+
+prompter() {
+ # $1 description; $2 pattern to validate against
+ local x
+ read -r -p "Enter the $1: " x
+ until eval "[[ \$x =~ ^$2\$ ]]"; do
+echo " $(red "$x") is not a proper $1" 1>&2
+read -r -p "Enter the $1: " x
+ done
+ echo "$x"
+}
+
+pretty() {
+ local f
+ f=$1
+ shift
+ git log "--pretty=tformat:$f" "$@"
+}
+gitCommits() { pretty %H "$@"; }
+gitCommit() { gitCommits -n1 "$@"; }
+gitSubject() { pretty %s "$@"; }
+
+selectFingerprint() {
+ local f fingerprints=()
+ if [[ $SELECTED_FINGERPRINT =~ ^[0-9a-fA-F]{40}$ ]]; then
+# it's already set, don't set it again
+return 0
+ fi
+ mapfile -t fingerprints < <(gpg --list-secret-keys --with-colons
--with-fingerprint 2>/dev/null | awk -F: '$1 == "fpr" {print $10}')
+ fingerprints+=('Other')
+ echo
+ echo "Select the $(green gpg) key to use:"
+ COLUMNS=1
+ select f in "${fingerprints[@]}"; do
+if [[ -z $f ]]; then
+ return 1
+elif [[ $f ==
(accumulo-access) branch 1.0.0-rc1-next created (now 4b89b6c)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git at 4b89b6c [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 4b89b6c [maven-release-plugin] prepare for next development iteration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(accumulo-access) 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1.0.0-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git commit 4b89b6c6a96b29a3187fbfc5c8b51ef794f41de2 Author: Dave Marion AuthorDate: Mon Feb 12 13:54:08 2024 + [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index da15e4c..1763b62 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-access - 1.0.0 + 1.0.1-SNAPSHOT Apache Accumulo Access Project Apache Accumulo Access is a library that provides the same functionality, semantics, and syntax as the Apache Accumulo ColumnVisibility and VisibilityEvaluator classes. This functionality is provided in a @@ -75,7 +75,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git scm:git:https://gitbox.apache.org/repos/asf/accumulo-access.git -rel/1.0.0 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo-access.git
(accumulo-access) branch 1.0.0-rc1 created (now 88702a4)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git at 88702a4 [maven-release-plugin] prepare release rel/1.0.0 No new revisions were added by this update.
(accumulo-access) branch 1.0.0-rc1 deleted (was 88702a4)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo-access.git was 88702a4 [maven-release-plugin] prepare release rel/1.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(accumulo-access) branch 1.0.0-rc1-next deleted (was 4b89b6c)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 1.0.0-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo-access.git was 4b89b6c [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 4b89b6c [maven-release-plugin] prepare for next development iteration discard 88702a4 [maven-release-plugin] prepare release rel/1.0.0
(accumulo-access) branch main updated: Changes based on testing release candidate creation (#40)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-access.git
The following commit(s) were added to refs/heads/main by this push:
new ec2f0ef Changes based on testing release candidate creation (#40)
ec2f0ef is described below
commit ec2f0efade3b084a04190449617d48ead8a2da15
Author: Dave Marion
AuthorDate: Mon Feb 12 09:20:30 2024 -0500
Changes based on testing release candidate creation (#40)
---
pom.xml | 2 +-
src/build/create-release-candidate.sh | 8 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0836585..5edf059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -440,7 +440,7 @@
clean deploy
clean package
rel/@{project.version}
- apache-release,accumulo-release
+ apache-release
false
false
true
diff --git a/src/build/create-release-candidate.sh
b/src/build/create-release-candidate.sh
index 6fb94ad..d368630 100755
--- a/src/build/create-release-candidate.sh
+++ b/src/build/create-release-candidate.sh
@@ -142,8 +142,6 @@ createEmail() {
[[ -n $3 ]] && stagingrepo=$3 || stagingrepo=$(prompter 'staging repository
number from https://repository.apache.org/#stagingRepositories' '[0-9]+')
local srcSha
[[ -n $4 ]] && srcSha=$4 || srcSha=$(prompter 'SHA512 for source tarball'
'[0-9a-f]{128}')
- local binSha
- [[ -n $5 ]] && binSha=$5 || binSha=$(prompter 'SHA512 for binary tarball'
'[0-9a-f]{128}')
local branch
branch=$ver-rc$rc
@@ -222,9 +220,7 @@ files will be added to the dist/release SVN area after
release:
$(yellow "$projName-$ver-$srcQualifier.tar.gz.sha512") will contain:
SHA512 ($(green "$projName-$ver-$srcQualifier.tar.gz")) = $(yellow "$srcSha")
-Release notes (in progress) can be found at: $(green
"https://$tlpName.apache.org/release/$projName-$ver;)
-
-Release testing instructions: $relTestingUrl
+Issues and pull requests related to this release can be found at: $(green
"https://github.com/apache/accumulo-access/issues?q=milestone%3A$ver;)
Please vote one of:
[ ] +1 - I have verified and accept...
@@ -425,7 +421,7 @@ createReleaseCandidate() {
# continue to creating email notification
echo "$(red Running)" "$(yellow "$scriptname" --email "$ver" "$rc")"
- createEmail "$ver" "$rc" "" "$srcSha" "$binSha"
+ createEmail "$ver" "$rc" "" "$srcSha"
}
SELECTED_FINGERPRINT=""
