This is an automated email from the ASF dual-hosted git repository.
jinwoo pushed a commit to branch support/2.0
in repository https://gitbox.apache.org/repos/asf/geode-examples.git
The following commit(s) were added to refs/heads/support/2.0 by this push:
new d2ee141 GEODE-10530: Migrate to Gradle 7.3.3, Java 17, and Geode 2.0.0
d2ee141 is described below
commit d2ee141543f83d378a345e97f6299e2ea41138d7
Author: Jinwoo Hwang <[email protected]>
AuthorDate: Mon Dec 8 09:55:02 2025 -0500
GEODE-10530: Migrate to Gradle 7.3.3, Java 17, and Geode 2.0.0
- Update Gradle wrapper from 5.5 to 7.3.3
- Upgrade Java compatibility from 8 to 17
- Update Apache Geode version to 2.0.0
- Replace all deprecated Gradle configurations (compile->implementation,
etc.)
- Update Lucene dependencies to 9.12.3 and fix API compatibility
- Update Spotless plugin to 6.11.0
- Fix test failures with Lucene 9 API changes
(RAMDirectory->ByteBuffersDirectory)
- Update CI workflow to Java 17
---
.github/workflows/gradle.yml | 2 +-
build.gradle | 13 +++++++++----
gradle.properties | 2 +-
gradle/spotless.gradle | 4 ++--
luceneSpatial/build.gradle | 3 ++-
.../geode/examples/luceneSpatial/SpatialHelperTest.java | 6 +++---
micrometerMetrics/build.gradle | 2 +-
sessionState/webapp/build.gradle | 10 ++++++----
.../webapp/gradle/wrapper/gradle-wrapper.properties | 2 +-
9 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index ad5ad3f..7952d23 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: ${{ matrix.distribution }}
- java-version: '8'
+ java-version: '17'
- name: Run All
uses: gradle/gradle-build-action@v2
with:
diff --git a/build.gradle b/build.gradle
index 551fdf9..d084615 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,9 @@
*/
plugins {
- id "org.nosphere.apache.rat" version "0.6.0"
- id "com.diffplug.gradle.spotless" version "3.0.0"
- id "de.undercouch.download" version "3.1.2"
+ id "org.nosphere.apache.rat" version "0.8.0"
+ id "com.diffplug.spotless" version "6.11.0"
+ id "de.undercouch.download" version "5.0.1"
}
allprojects {
@@ -66,6 +66,11 @@ task installGeode(type: Copy) {
subprojects {
apply plugin: 'java-library'
+ java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+
dependencies {
// All callouts to org.apache.geode here, need to be specified in
settings.gradle
// for composite build to work
@@ -88,7 +93,7 @@ subprojects {
}
jar {
- archiveName "${baseName}.${extension}"
+ archiveFileName = "${archiveBaseName}.${archiveExtension}"
}
task cleanServer {
diff --git a/gradle.properties b/gradle.properties
index 3995b02..eabfcce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@
# Develop to use latest 1.15.1 artifacts until CI is rebuilt
# GEODE-10436
version = 2.0.0-build.0
-geodeVersion = 2.0.+
+geodeVersion = 2.0.0
# release properties, set these on the command line to validate against
# a release candidate
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 77d29d2..78da11e 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -15,12 +15,12 @@
* limitations under the License.
*/
subprojects {
- apply plugin: "com.diffplug.gradle.spotless"
+ apply plugin: "com.diffplug.spotless"
spotless {
lineEndings = 'unix';
java {
target project.fileTree(project.projectDir) { include '**/*.java' }
- eclipseFormatFile
"${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
+ eclipse().configFile
"${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
}
}
}
diff --git a/luceneSpatial/build.gradle b/luceneSpatial/build.gradle
index 310a7af..66a646d 100644
--- a/luceneSpatial/build.gradle
+++ b/luceneSpatial/build.gradle
@@ -16,7 +16,8 @@
*/
dependencies {
implementation "org.apache.geode:geode-lucene:$geodeVersion"
- implementation "org.apache.lucene:lucene-spatial-extras:6.4.1"
+ implementation "org.apache.lucene:lucene-spatial-extras:9.12.3"
+ implementation "org.locationtech.spatial4j:spatial4j:0.8"
}
task copyDependencies(type:Copy) {
diff --git
a/luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java
b/luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java
index 71180f7..4bbb3d3 100644
---
a/luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java
+++
b/luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java
@@ -27,7 +27,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SearcherManager;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.junit.Test;
public class SpatialHelperTest {
@@ -36,7 +36,7 @@ public class SpatialHelperTest {
public void queryFindsADocumentThatWasAdded() throws IOException {
// Create an in memory lucene index to add a document to
- RAMDirectory directory = new RAMDirectory();
+ ByteBuffersDirectory directory = new ByteBuffersDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig());
// Add a document to the lucene index
@@ -55,6 +55,6 @@ public class SpatialHelperTest {
SearcherManager searcherManager = new SearcherManager(writer, null);
IndexSearcher searcher = searcherManager.acquire();
TopDocs results = searcher.search(query, 100);
- assertEquals(1, results.totalHits);
+ assertEquals(1, results.totalHits.value);
}
}
diff --git a/micrometerMetrics/build.gradle b/micrometerMetrics/build.gradle
index 96a82c3..8395a74 100644
--- a/micrometerMetrics/build.gradle
+++ b/micrometerMetrics/build.gradle
@@ -21,7 +21,7 @@ configurations {
dependencies {
dependenciesToIncludeInEndpointJar
"io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
-
configurations.implementation.extendsFrom(configurations.dependenciesToIncludeInEndpointJar)
+ implementation configurations.dependenciesToIncludeInEndpointJar
}
jar {
diff --git a/sessionState/webapp/build.gradle b/sessionState/webapp/build.gradle
index c36bd07..1903a40 100644
--- a/sessionState/webapp/build.gradle
+++ b/sessionState/webapp/build.gradle
@@ -19,7 +19,10 @@
version '1.0-SNAPSHOT'
-sourceCompatibility = 1.8
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+}
repositories {
mavenCentral()
@@ -27,8 +30,7 @@ repositories {
dependencies {
// https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
- providedCompile group: 'javax.servlet', name: 'javax.servlet-api',
version: '3.1.0'
+ compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version:
'3.1.0'
- testCompile group: 'junit', name: 'junit', version: '4.11'
- testCompile group: 'junit', name: 'junit', version: '4.12'
+ testImplementation group: 'junit', name: 'junit', version: '4.12'
}
diff --git a/sessionState/webapp/gradle/wrapper/gradle-wrapper.properties
b/sessionState/webapp/gradle/wrapper/gradle-wrapper.properties
index e36600c..f5799db 100644
--- a/sessionState/webapp/gradle/wrapper/gradle-wrapper.properties
+++ b/sessionState/webapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
