You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/10/07 17:22:30 UTC
[accumulo] branch main updated (6281a33 -> 80ee9ca)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 6281a33 Mark security properities experimental (#1721)
add 314f2aa Update release candidate script (#1724)
new 80ee9ca Merge branch '1.10' into main
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:
assemble/build.sh | 157 +++++++++++++++++++++++++++++++++++++++---------------
pom.xml | 6 +--
2 files changed, 116 insertions(+), 47 deletions(-)
[accumulo] 01/01: Merge branch '1.10' into main
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 80ee9ca8092dc4bf07aa1a046d6e668f0e16300e
Merge: 6281a33 314f2aa
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Oct 7 13:21:46 2020 -0400
Merge branch '1.10' into main
assemble/build.sh | 157 +++++++++++++++++++++++++++++++++++++++---------------
pom.xml | 6 +--
2 files changed, 116 insertions(+), 47 deletions(-)
diff --cc pom.xml
index 3f62ad3,84101f1..8f7f1b1
--- a/pom.xml
+++ b/pom.xml
@@@ -118,11 -118,9 +118,9 @@@
<!-- bouncycastle version for test dependencies -->
<bouncycastle.version>1.66</bouncycastle.version>
<!-- Curator version -->
- <curator.version>2.11.0</curator.version>
+ <curator.version>4.3.0</curator.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
<eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
- <!-- extra release args for testing -->
- <extraReleaseArguments />
<failsafe.excludedGroups />
<failsafe.groups />
<!-- surefire/failsafe plugin option -->
@@@ -941,12 -683,12 +939,12 @@@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArguments}</arguments>
+ <arguments>-P !autoformat,thrift -DskipTests</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
- <preparationGoals>clean verify</preparationGoals>
+ <preparationGoals>clean package</preparationGoals>
<tagNameFormat>rel/@{project.version}</tagNameFormat>
- <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles>
+ <releaseProfiles>apache-release,accumulo-release</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>