Skip to content

[GEODE-10530] Migrate to Gradle 7.3.3, Java 17, and Geode 2.0.0 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JinwooHwang merged 4 commits into from
Dec 9, 2025
Merged

[GEODE-10530] Migrate to Gradle 7.3.3, Java 17, and Geode 2.0.0 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f238523
GEODE-10530: Migrate to Gradle 7.3.3, Java 17, and Geode 2.0.0
JinwooHwang Dec 8, 2025
ceb3d8e
Add staging repository URL to CI workflow
JinwooHwang Dec 8, 2025
66fedab
Fix jar archive filename configuration
JinwooHwang Dec 8, 2025
60e1578
Replace sh sleep with native gfsh sleep command
JinwooHwang Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ 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:
arguments: runAll --console=plain --no-daemon
arguments: runAll -PgeodeRepositoryUrl=https://repository.apache.org/content/repositories/orgapachegeode-1146 --console=plain --no-daemon
Copy link
Member

@sboorlagadda sboorlagadda Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to keep them on this branch first and then again update it when 2.0.0? is released

Copy link
Contributor Author

@JinwooHwang JinwooHwang Dec 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes @sboorlagadda . Thank you for your review.

Copy link
Member

@sboorlagadda sboorlagadda Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I see you already updated to 2.1.0 last week with this commit #2a1186e

So you want this update to 2.0.0 RC so that people can verify examples work (part of the release check) and then go back to 2.1.0?

Copy link
Contributor Author

@JinwooHwang JinwooHwang Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly.

Copy link
Member

@sboorlagadda sboorlagadda Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarification. I am approving it now. But I want to go back and see in the past how this is done. Because it is always the case that the develop will be rolled up before the release etc. LGTM for now.

Copy link
Contributor Author

@JinwooHwang JinwooHwang Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much for your approval @sboorlagadda

13 changes: 9 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand All @@ -88,7 +93,7 @@ subprojects {
}

jar {
archiveName "${baseName}.${extension}"
archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
}

task cleanServer {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Develop to use latest 1.15.1 artifacts until CI is rebuilt
# GEODE-10436
version = 2.1.0-build.0
geodeVersion = 2.1.+
geodeVersion = 2.0.0

# release properties, set these on the command line to validate against
# a release candidate
Expand Down
2 changes: 1 addition & 1 deletion gradle/release.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ gradle.taskGraph.whenReady { taskGraph ->

distributions {
src {
baseName = 'apache-geode-examples'
distributionBaseName = 'apache-geode-examples'
version = version + '-src'
contents {
from (rootDir) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/spotless.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
2 changes: 1 addition & 1 deletion lucene/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
* limitations under the License.
*/
dependencies {
compile "org.apache.geode:geode-lucene:$geodeVersion"
implementation "org.apache.geode:geode-lucene:$geodeVersion"
}
7 changes: 4 additions & 3 deletions luceneSpatial/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
* limitations under the License.
*/
dependencies {
compile "org.apache.geode:geode-lucene:$geodeVersion"
compile "org.apache.lucene:lucene-spatial-extras:6.4.1"
implementation "org.apache.geode:geode-lucene:$geodeVersion"
implementation "org.apache.lucene:lucene-spatial-extras:9.12.3"
implementation "org.locationtech.spatial4j:spatial4j:0.8"
}

task copyDependencies(type:Copy) {
into "$buildDir/libs"
from configurations['runtime']
from configurations.runtimeClasspath
}

build.dependsOn(copyDependencies)
6 changes: 3 additions & 3 deletions luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
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 {
Expand All @@ -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
Expand All @@ -55,6 +55,6 @@ public void queryFindsADocumentThatWasAdded() throws IOException {
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);
}
}
2 changes: 1 addition & 1 deletion micrometerMetrics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ configurations {

dependencies {
dependenciesToIncludeInEndpointJar "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
configurations.compile.extendsFrom(configurations.dependenciesToIncludeInEndpointJar)
implementation configurations.dependenciesToIncludeInEndpointJar
}

jar {
Expand Down
10 changes: 6 additions & 4 deletions sessionState/webapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@

version '1.0-SNAPSHOT'

sourceCompatibility = 1.8
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

repositories {
mavenCentral()
}

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'
}
2 changes: 1 addition & 1 deletion sessionState/webapp/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion wan/scripts/start.gfsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ disconnect
# Start the New York (ny) cluster
run --file=./scripts/start-ny.gfsh
disconnect
sh sleep 5
sleep --time=5

# Create the region on each cluster and bind the gateway senders/receivers to region
run --file=./scripts/start-wan.gfsh
Expand Down
Loading