diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index fb0d9e9..a04562e 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -39,11 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: adopt - java-version: 17 + java-version: 21 cache: 'maven' - name: Build with Maven (${{ matrix.profile.name }}) run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }} @@ -70,4 +70,3 @@ jobs: name: mini-tests-logs-${{ matrix.profile.name }} path: ./**/target/**/mini-tests/**/logs/ if-no-files-found: ignore - diff --git a/conf/env.sh.example b/conf/env.sh.example index ec42633..f4a9eb2 100644 --- a/conf/env.sh.example +++ b/conf/env.sh.example @@ -32,7 +32,7 @@ conf_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # Versions set below will be what is included in the shaded jar export ACCUMULO_VERSION="`$ACCUMULO_HOME/bin/accumulo version`" export HADOOP_VERSION="`$HADOOP_HOME/bin/hadoop version | head -n1 | awk '{print $2}'`" -export ZOOKEEPER_VERSION=3.7.0 +export ZOOKEEPER_VERSION=3.9.5 # Path to shaded test jar ex_home=$( cd "$( dirname "$conf_dir" )" && pwd ) export EXAMPLES_JAR_PATH="${ex_home}/target/accumulo-examples-shaded.jar" diff --git a/pom.xml b/pom.xml index cdd3af2..b14df38 100644 --- a/pom.xml +++ b/pom.xml @@ -20,24 +20,24 @@ org.apache apache - 31 + 37 org.apache.accumulo accumulo-examples - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT Apache Accumulo Examples Example code and corresponding documentation for using Apache Accumulo - 3.1.0-SNAPSHOT + 4.0.0-SNAPSHOT contrib/Eclipse-Accumulo-Codestyle.xml - 3.3.6 - 11 - 11 - 11 - 11 + 3.4.2 + 17 + 17 + 17 + 21 2020-12-17T22:06:50Z - 3.8.3 + 3.9.5 @@ -114,6 +114,19 @@ test + + + + false + + + true + + apache.snapshots + Apache Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + ${project.artifactId} @@ -185,7 +198,7 @@ com.puppycrawl.tools checkstyle - 10.12.2 + 11.0.1 @@ -200,7 +213,7 @@ net.revelc.code impsort-maven-plugin - 1.9.0 + 1.13.0 true java.,javax.,jakarta.,org.,com. @@ -238,7 +251,7 @@ net.revelc.code.formatter formatter-maven-plugin - 2.23.0 + 2.29.0 ${eclipseFormatterStyle} LF diff --git a/src/main/java/org/apache/accumulo/examples/shard/ContinuousQuery.java b/src/main/java/org/apache/accumulo/examples/shard/ContinuousQuery.java index 343bcdd..ca14029 100644 --- a/src/main/java/org/apache/accumulo/examples/shard/ContinuousQuery.java +++ b/src/main/java/org/apache/accumulo/examples/shard/ContinuousQuery.java @@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception { bs.clearScanIterators(); bs.clearColumns(); - IteratorSetting ii = new IteratorSetting(20, "ii", IntersectingIterator.class); + IteratorSetting ii = new IteratorSetting(30, "ii", IntersectingIterator.class); IntersectingIterator.setColumnFamilies(ii, columns); bs.addScanIterator(ii); bs.setRanges(Collections.singleton(new Range())); diff --git a/src/main/java/org/apache/accumulo/examples/shard/Query.java b/src/main/java/org/apache/accumulo/examples/shard/Query.java index f888a1d..e21207c 100644 --- a/src/main/java/org/apache/accumulo/examples/shard/Query.java +++ b/src/main/java/org/apache/accumulo/examples/shard/Query.java @@ -70,10 +70,10 @@ public static List query(BatchScanner bs, List terms, Integer cu IteratorSetting ii; if (cutoff != null) { - ii = new IteratorSetting(20, "ii", CutoffIntersectingIterator.class); + ii = new IteratorSetting(30, "ii", CutoffIntersectingIterator.class); CutoffIntersectingIterator.setCutoff(ii, cutoff); } else { - ii = new IteratorSetting(20, "ii", IntersectingIterator.class); + ii = new IteratorSetting(30, "ii", IntersectingIterator.class); } IntersectingIterator.setColumnFamilies(ii, columns);