backport/geode 10257/upgrade java

boms/geode-all-bom/build.gradle

@@ -17,10 +17,11 @@
 
 plugins {
   id 'java-platform'
-  id 'geode-dependency-constraints'
+  id 'org.apache.geode.gradle.geode-dependency-constraints'
+  id 'geode-publish-common'
 }
 
-apply from: "${rootDir}/gradle/publish-common.gradle"
+DependencyConstraints.apply(project)
 
 publishing {
   publications {

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -198,9 +198,9 @@
         <version>1.8.5</version>
       </dependency>
       <dependency>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-annotations</artifactId>
-        <version>1.6.6</version>
+        <version>2.2.0</version>
       </dependency>
       <dependency>
         <groupId>it.unimi.dsi</groupId>
@@ -513,14 +513,9 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger-ui</artifactId>
-        <version>2.9.2</version>
-      </dependency>
-      <dependency>
-        <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger2</artifactId>
-        <version>2.9.2</version>
+        <groupId>org.springdoc</groupId>
+        <artifactId>springdoc-openapi-ui</artifactId>
+        <version>1.6.8</version>
       </dependency>
       <dependency>
         <groupId>mx4j</groupId>

boms/geode-client-bom/build.gradle

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+plugins {
+  id 'standard-subproject-configuration'
+  id 'io.spring.dependency-management'
+  id 'geode-publish-common'
+}
 
-apply plugin: "io.spring.dependency-management"
-apply from: "${project.projectDir}/../../gradle/publish-common.gradle"
 
 jar.enabled = false
 

buildSrc/build.gradle → build-tools/geode-annotation-processor/build.gradle

@@ -18,31 +18,32 @@
 
 plugins {
   id 'java'
+  id 'java-gradle-plugin'
+  id 'groovy-gradle-plugin'
+  id 'maven-publish'
+  id 'com.gradle.plugin-publish' version '0.18.0'
 }
 
 repositories {
   mavenCentral()
-  gradlePluginPortal() {
-    content {
-      includeModule('me.champeau.gradle', 'japicmp-gradle-plugin')
-    }
-  }
 }
 
 dependencies {
   testRuntimeOnly('org.apache.geode:geode-junit:1.3.0') {
     transitive(false)
   }
   implementation(gradleApi())
-  implementation('org.apache.commons:commons-lang3:3.12.0')
-  implementation('org.apache.maven:maven-artifact:3.8.5')
-  implementation('com.google.guava:guava:31.1-jre')
-  implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0')
-  implementation('junit:junit:4.13.2')
+
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 
   testAnnotationProcessor(this.project)
 }
 
+test {
+  useJUnitPlatform()
+}
+
 sourceSets {
   main {
     java {

build-tools/geode-annotation-processor/settings.gradle

@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+rootProject.name = 'geode-annotation-processor'

build-tools/geode-build-tools/build.gradle

@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+plugins {
+  id 'java'
+  id 'java-gradle-plugin'
+  id 'groovy-gradle-plugin'
+  id 'maven-publish'
+  id 'com.gradle.plugin-publish' version '0.18.0'
+}
+
+repositories {
+  mavenCentral()
+  gradlePluginPortal()
+}
+
+dependencies {
+  implementation(gradleApi())
+
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+test {
+  useJUnitPlatform()
+}
+
+group = 'org.apache.geode.gradle'
+version = 1.0
+
+gradlePlugin {
+  plugins.register('geode-build-tools') {
+    id = 'org.apache.geode.gradle.geode-build-tools'
+    implementationClass = 'org.apache.geode.gradle.plugins.BuildToolsPlugin'
+  }
+}

build-tools/geode-build-tools/settings.gradle

@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+rootProject.name = 'geode-build-tools'

build-tools/geode-build-tools/src/main/groovy/org/apache/geode/gradle/plugins/BuildToolsPlugin.groovy

@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.gradle.plugins;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+
+public class BuildToolsPlugin implements Plugin<Project> {
+  public void apply(Project project) {
+    // this plugin doesn't create any task by default
+  }
+}

buildSrc/src/main/groovy/org/apache/geode/gradle/PasswordDialog.groovy → build-tools/geode-build-tools/src/main/groovy/org/apache/geode/gradle/plugins/PasswordDialog.groovy

@@ -14,7 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package org.apache.geode.gradle.plugins
+
 import groovy.swing.SwingBuilder
+
 class PasswordDialog {
   static String askPassword(String prompt) {
     def password = ''

build-tools/geode-build-tools/src/main/groovy/org/apache/geode/gradle/plugins/TestPropertiesWriter.groovy

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.gradle.plugins
+
+import java.io.BufferedWriter
+import java.io.File
+import java.util.Properties
+
+class TestPropertiesWriter {
+  static void writeTestProperties(File parent, String name) {
+    Properties props = new Properties()
+    props.setProperty('log-level', 'config')
+    File propsFile = new File(testResultsDir(parent, name), 'gemfire.properties')
+    BufferedWriter writer = propsFile.newWriter()
+    props.store(writer, 'Autogenerated Gemfire properties')
+  }
+
+  static File testResultsDir(File parent, String name) {
+    return new File(parent, name)
+  }
+}
+
+