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 2023/12/21 08:30:23 UTC

(accumulo) branch main updated (37117b2cb5 -> a6f22a32ce)

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 37117b2cb5 Use LogEntry concrete type in more places (#4085)
     add c7df850d83 Pre-release build quality updates (#4093)
     new a6f22a32ce Merge branch '2.1'

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:
 .github/ISSUE_TEMPLATE/post_vote_checklist.md      |  5 +-
 .github/workflows/maven-full-its.yaml              | 18 ++--
 .github/workflows/maven-on-demand.yaml             |  8 +-
 .github/workflows/maven.yaml                       | 21 +++--
 .github/workflows/scripts.yaml                     |  6 +-
 assemble/pom.xml                                   |  5 --
 core/pom.xml                                       |  4 -
 .../org/apache/accumulo/core/trace/TraceUtil.java  |  8 +-
 pom.xml                                            | 99 ++++++++--------------
 .../accumulo/server/util/RestoreZookeeper.java     |  7 +-
 server/monitor/pom.xml                             |  6 ++
 11 files changed, 78 insertions(+), 109 deletions(-)


(accumulo) 01/01: Merge branch '2.1'

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 a6f22a32cedc4a50d75825813c1eef9ad9a0b0a2
Merge: 37117b2cb5 c7df850d83
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Dec 21 02:13:19 2023 -0500

    Merge branch '2.1'

 .github/ISSUE_TEMPLATE/post_vote_checklist.md      |  5 +-
 .github/workflows/maven-full-its.yaml              | 18 ++--
 .github/workflows/maven-on-demand.yaml             |  8 +-
 .github/workflows/maven.yaml                       | 21 +++--
 .github/workflows/scripts.yaml                     |  6 +-
 assemble/pom.xml                                   |  5 --
 core/pom.xml                                       |  4 -
 .../org/apache/accumulo/core/trace/TraceUtil.java  |  8 +-
 pom.xml                                            | 99 ++++++++--------------
 .../accumulo/server/util/RestoreZookeeper.java     |  7 +-
 server/monitor/pom.xml                             |  6 ++
 11 files changed, 78 insertions(+), 109 deletions(-)

diff --cc pom.xml
index e49fd960d5,b982196bff..798c876af1
--- a/pom.xml
+++ b/pom.xml
@@@ -133,10 -134,9 +133,9 @@@
      <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>
-     <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
-     <minimalMavenBuildVersion>3.6.0</minimalMavenBuildVersion>
+     <minimalJavaBuildVersion>17</minimalJavaBuildVersion>
      <!-- timestamp for reproducible outputs, updated on release by the release plugin -->
 -    <project.build.outputTimestamp>2023-08-14T08:01:47Z</project.build.outputTimestamp>
 +    <project.build.outputTimestamp>2023-08-14T08:11:10Z</project.build.outputTimestamp>
      <rat.consoleOutput>true</rat.consoleOutput>
      <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
      <surefire.excludedGroups />
@@@ -151,11 -151,11 +150,10 @@@
      <version.curator>5.5.0</version.curator>
      <version.errorprone>2.23.0</version.errorprone>
      <version.hadoop>3.3.6</version.hadoop>
-     <version.maven-javadoc-plugin>3.6.0</version.maven-javadoc-plugin>
-     <version.opentelemetry>1.27.0</version.opentelemetry>
-     <version.slf4j>2.0.7</version.slf4j>
+     <version.opentelemetry>1.33.0</version.opentelemetry>
 -    <version.powermock>2.0.9</version.powermock>
+     <version.slf4j>2.0.9</version.slf4j>
      <version.thrift>0.17.0</version.thrift>
-     <version.zookeeper>3.8.3</version.zookeeper>
+     <version.zookeeper>3.9.1</version.zookeeper>
    </properties>
    <dependencyManagement>
      <dependencies>
@@@ -295,8 -288,13 +286,8 @@@
        <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
-         <version>32.0.1-jre</version>
+         <version>33.0.0-jre</version>
        </dependency>
 -      <dependency>
 -        <groupId>com.google.protobuf</groupId>
 -        <artifactId>protobuf-java</artifactId>
 -        <version>3.22.0</version>
 -      </dependency>
        <dependency>
          <groupId>com.lmax</groupId>
          <artifactId>disruptor</artifactId>
@@@ -945,6 -985,10 +931,8 @@@
                  <unused>org.apache.logging.log4j:log4j-1.2-api:jar:*</unused>
                  <unused>org.apache.logging.log4j:log4j-slf4j2-impl:jar:*</unused>
                  <unused>org.apache.logging.log4j:log4j-web:jar:*</unused>
+                 <!-- ignore log4j dep used for annotations and needed for compile time linting -->
+                 <unused>biz.aQute.bnd:biz.aQute.bnd.annotation:jar:*</unused>
 -                <!-- This should be removed upon completion of migrating junit 4 to 5 -->
 -                <unused>org.junit.vintage:junit-vintage-engine:jar:*</unused>
                  <unused>org.junit.jupiter:junit-jupiter-engine:jar:*</unused>
                </ignoredUnusedDeclaredDependencies>
              </configuration>