Merge pull request #117 from JinwooHwang/feature/GEODE-10530

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

Author: JinwooHwang

.github/workflows/gradle.yml

@@ -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

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.get()}.${archiveExtension.get()}"
     }
 
     task cleanServer {

gradle.properties

@@ -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

gradle/release.gradle

@@ -63,7 +63,7 @@ gradle.taskGraph.whenReady { taskGraph ->
 
 distributions {
   src {
-    baseName = 'apache-geode-examples'
+    distributionBaseName = 'apache-geode-examples'
     version = version + '-src'
     contents {
       from (rootDir) {

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"
     }
   }
 }

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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

lucene/build.gradle

@@ -15,5 +15,5 @@
  * limitations under the License.
  */
 dependencies {
-    compile "org.apache.geode:geode-lucene:$geodeVersion"
+    implementation "org.apache.geode:geode-lucene:$geodeVersion"
 }

luceneSpatial/build.gradle

@@ -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)

luceneSpatial/src/test/java/org/apache/geode/examples/luceneSpatial/SpatialHelperTest.java

@@ -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 {
@@ -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 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);
   }
 }

micrometerMetrics/build.gradle

@@ -21,7 +21,7 @@ configurations {
 
 dependencies {
     dependenciesToIncludeInEndpointJar "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
-    configurations.compile.extendsFrom(configurations.dependenciesToIncludeInEndpointJar)
+    implementation configurations.dependenciesToIncludeInEndpointJar
 }
 
 jar {