You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2020/08/24 19:14:04 UTC
[accumulo] branch main updated (0702e08 -> 677f460)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 0702e08 Merge branch '1.10' into main
add 0303082 Update bouncycastle version to 1.66 (#1690)
add a6cbf09 Update powermock to 2.0.7 (#1691)
new 677f460 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:
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[accumulo] 01/01: Merge branch '1.10' into main
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 677f46040aad0a81862378c1099a6cf33cb59cf2
Merge: 0702e08 a6cbf09
Author: Mike Miller <mm...@apache.org>
AuthorDate: Mon Aug 24 14:54:31 2020 -0400
Merge branch '1.10' into main
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc pom.xml
index 224aeca,7a5d566..4df5105
--- a/pom.xml
+++ b/pom.xml
@@@ -116,9 -116,9 +116,9 @@@
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
<!-- bouncycastle version for test dependencies -->
- <bouncycastle.version>1.64</bouncycastle.version>
+ <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 -->
@@@ -127,21 -127,21 +127,21 @@@
<failsafe.groups />
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
- <!-- version that works when building with Hadoop 2 or 3.0; use 27.0-jre for 3.1 and later -->
- <guava.version>14.0.1</guava.version>
- <hadoop.version>2.6.5</hadoop.version>
+ <hadoop.version>3.2.1</hadoop.version>
+ <hk2.version>2.6.1</hk2.version>
<htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
- <htrace.version>3.1.0-incubating</htrace.version>
+ <htrace.version>3.2.0-incubating</htrace.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
- <jetty.version>9.2.26.v20180806</jetty.version>
- <maven.compiler.release>8</maven.compiler.release>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.plugin-version>3.5.0</maven.plugin-version>
+ <javax.el.version>3.0.1-b06</javax.el.version>
+ <jaxb.version>2.3.0.1</jaxb.version>
+ <jersey.version>2.30.1</jersey.version>
+ <jetty.version>9.4.27.v20200227</jetty.version>
+ <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<!-- surefire/failsafe plugin option -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <powermock.version>2.0.5</powermock.version>
+ <powermock.version>2.0.7</powermock.version>
<!-- timestamp for reproducible outputs, updated on release by the release plugin -->
<project.build.outputTimestamp>2020-08-18T00:00:00Z</project.build.outputTimestamp>
<!-- surefire/failsafe plugin option -->