Merge pull request #189 from harbby/dev

add support for gradle 7.x

Author: harbby

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-  id "com.github.hierynomus.license" version "0.14.0"
-  id "com.github.harbby.gradle.serviceloader" version "1.1.5"
+  id "com.github.hierynomus.license" version "0.16.1"
+  id "com.github.harbby.gradle.serviceloader" version "1.1.8"
   id "jacoco"
 }
 
@@ -18,7 +18,7 @@ allprojects {
           joda_time           : '2.9.3',
           slf4j               : '1.7.25',
           guice               : '4.2.1',
-          gadtry              : '1.9.2-SNAPSHOT',
+          gadtry              : '1.9.4',
           guava               : '27.0-jre',
           jackson             : '2.9.8',
           jersey              : '2.28',
@@ -28,7 +28,8 @@ allprojects {
 
 subprojects {
   apply plugin: 'java'
-  apply plugin: 'maven'
+  apply plugin: 'java-library'
+  apply plugin: 'maven-publish'
   apply plugin: 'checkstyle'
   apply plugin: 'jacoco'
 
@@ -53,7 +54,7 @@ subprojects {
 
   repositories {
     mavenLocal()
-    //maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+    //maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
     mavenCentral()
     maven {
       url 'https://oss.sonatype.org/service/local/repositories/snapshots/content/'
@@ -160,49 +161,49 @@ subprojects {
     sign configurations.archives
   }
 
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-          authentication(userName: mavenUsername, password: mavenPassword)
-        }
-
-        snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-          authentication(userName: mavenUsername, password: mavenPassword)
-        }
-
-        pom.project {
-          name project.name
-          packaging 'jar'
-          // optionally artifactId can be defined here
-          description 'A lightweight API test framework'
-          url 'https://github.com/harbby/sylph'
-
-          scm {
-            connection 'https://github.com/harbby/sylph.git'
-            developerConnection 'git@github.com:harbby/sylph.git'
-            url 'https://github.com/harbby/sylph'
-          }
-
-          licenses {
-            license {
-              name 'The Apache Software License, Version 2.0'
-              url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-              distribution 'repo'
-            }
-          }
-
-          developers {
-            developer {
-              id 'harbby'
-              name 'harbby'
-              email 'yezhixinghai@gmail.com'
-            }
-          }
-        }
-      }
-    }
-  }
+//  uploadArchives {
+//    repositories {
+//      mavenDeployer {
+//        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+//
+//        repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+//          authentication(userName: mavenUsername, password: mavenPassword)
+//        }
+//
+//        snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+//          authentication(userName: mavenUsername, password: mavenPassword)
+//        }
+//
+//        pom.project {
+//          name project.name
+//          packaging 'jar'
+//          // optionally artifactId can be defined here
+//          description 'A lightweight API test framework'
+//          url 'https://github.com/harbby/sylph'
+//
+//          scm {
+//            connection 'https://github.com/harbby/sylph.git'
+//            developerConnection 'git@github.com:harbby/sylph.git'
+//            url 'https://github.com/harbby/sylph'
+//          }
+//
+//          licenses {
+//            license {
+//              name 'The Apache Software License, Version 2.0'
+//              url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+//              distribution 'repo'
+//            }
+//          }
+//
+//          developers {
+//            developer {
+//              id 'harbby'
+//              name 'harbby'
+//              email 'yezhixinghai@gmail.com'
+//            }
+//          }
+//        }
+//      }
+//    }
+//  }
 }

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-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

profile-java11.gradle

@@ -5,8 +5,8 @@ targetCompatibility = 11
 
 if (project == project(':sylph-web')) {
   project.dependencies {
-    compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
-    compile group: 'javax.activation', name: 'activation', version: '1.1.1'
+    implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
+    implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
   }
 }
 

sylph-api/build.gradle

@@ -2,5 +2,5 @@ ext.moduleName = 'ideal.sylph.api'
 
 
 dependencies {
-  compile group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
+  api group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
 }

sylph-connectors/build.gradle

@@ -19,7 +19,7 @@ subprojects {
   def plugins = project(':sylph-dist').buildDir.path + "/plugins/${name}"
   task buildPlugins(type: Copy) {
 
-    from(configurations.runtime)
+    from(configurations.runtimeClasspath)
     from(jar)
 
     into plugins

sylph-connectors/flink-kafka/build.gradle

@@ -4,15 +4,15 @@ dependencies {
   compileOnly(group: 'org.apache.flink', name: 'flink-streaming-scala_2.12', version: deps.flink) {
     exclude(module: 'flink-shaded-hadoop2')
   }
-  compile group: 'org.apache.flink', name: 'flink-connector-kafka_2.12', version: deps.flink
-  compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: deps.jackson
+  api group: 'org.apache.flink', name: 'flink-connector-kafka_2.12', version: deps.flink
+  api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: deps.jackson
 
   compileOnly project(":sylph-api")
-  compile 'com.jayway.jsonpath:json-path:2.4.0'
+  api 'com.jayway.jsonpath:json-path:2.4.0'
 
   testCompile group: 'org.javassist', name: 'javassist', version: '3.26.0-GA'
 
-  compile group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
+  api group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
 
   testCompile project(':sylph-runners:sylph-flink')
   testCompile project(':sylph-spi')

sylph-connectors/spark-kafka/build.gradle

@@ -16,12 +16,12 @@ dependencies {
     /**
      * spark 结构化流 kafka专用
      * */
-    compile group: 'org.apache.spark', name: 'spark-sql-kafka-0-10_2.12', version: deps.spark
+    implementation group: 'org.apache.spark', name: 'spark-sql-kafka-0-10_2.12', version: deps.spark
 
     /**
      * spark streaming kafka 依赖
      * */
-    compile(group: 'org.apache.spark', name: 'spark-streaming-kafka-0-10_2.12', version: deps.spark) {
+    implementation(group: 'org.apache.spark', name: 'spark-streaming-kafka-0-10_2.12', version: deps.spark) {
         exclude(group: 'org.spark-project.spark')
         exclude(group: 'org.scala-lang')
         exclude(module: 'spark-tags_2.12')

sylph-connectors/sylph-hdfs/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-  compile group: 'org.apache.parquet', name: 'parquet-hadoop', version: '1.8.3'
-  compile group: 'joda-time', name: 'joda-time', version: deps.joda_time
+  implementation group: 'org.apache.parquet', name: 'parquet-hadoop', version: '1.8.3'
+  implementation group: 'joda-time', name: 'joda-time', version: deps.joda_time
   compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: deps.hadoop
 
 //  compile group: 'com.hadoop.gplcompression', name: 'hadoop-lzo', version: '0.4.20'
 //  compile group: 'com.snowplowanalytics', name: 'hadoop-lzo', version: '0.4.20'
-  compile 'commons-collections:commons-collections:3.2.2'
+  implementation 'commons-collections:commons-collections:3.2.2'
 }

sylph-connectors/sylph-kudu/build.gradle

@@ -1,6 +1,6 @@
 
 dependencies {
-    compile 'org.apache.kudu:kudu-client:1.7.0'
+    implementation 'org.apache.kudu:kudu-client:1.7.0'
 
     testCompile project(':sylph-runners:sylph-flink')
     testCompile project(':sylph-spi')

sylph-connectors/sylph-mysql/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-  compile group: 'org.apache.flink', name: 'flink-shaded-guava', version: '18.0-5.0'
+  implementation group: 'org.apache.flink', name: 'flink-shaded-guava', version: '18.0-5.0'
   compileOnly project(":sylph-api")
   compileOnly group: 'org.slf4j', name: 'slf4j-api', version: deps.slf4j
-  runtime group: 'mysql', name: 'mysql-connector-java', version: '8.0.15'
+  runtimeOnly group: 'mysql', name: 'mysql-connector-java', version: '8.0.15'
 }

sylph-dist/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-  compile project(':sylph-main')
+  implementation project(':sylph-main')
 }
 
 task copyLibs(type: Copy) {
-  from(configurations.runtime)
+  from(configurations.runtimeClasspath)
   into project.buildDir.path + '/lib'
 }
 task copyFiles(type: Copy, dependsOn: copyLibs) {
@@ -18,7 +18,7 @@ task dist(type: Tar) {
   compression = Compression.GZIP
   def tarpath = baseName + "-${rootProject.version}"
 
-  from(configurations.runtime) {
+  from(configurations.runtimeClasspath) {
     into tarpath + "/lib"
   }
 
@@ -57,5 +57,5 @@ dist.dependsOn copyFiles
 //  'default' dist
 //}
 
-tasks.findByName("uploadArchives").setEnabled(false)
+tasks.findByName("uploadArchives")?.setEnabled(false)
 //tasks.remove(tasks.findByName("uploadArchives"))

sylph-main/build.gradle

@@ -3,14 +3,14 @@ ext.moduleName = 'ideal.sylph.main'
 apply plugin: 'application'
 
 dependencies {
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
-  compile 'org.xerial:sqlite-jdbc:3.25.2'
-  compile group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7'
-  
-  compile project(':sylph-web')
-  compile(project(':sylph-spi'))
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
+  implementation 'org.xerial:sqlite-jdbc:3.25.2'
+  implementation group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7'
 
-  testCompile group: 'org.fusesource.jansi', name: 'jansi', version: '1.17.1'
+  implementation project(':sylph-web')
+  implementation(project(':sylph-spi'))
+
+  testImplementation group: 'org.fusesource.jansi', name: 'jansi', version: '1.17.1'
 }
 
 application {

sylph-main/src/main/java/ideal/sylph/main/SylphMaster.java

@@ -67,7 +67,7 @@ public static void main(String[] args)
                     binder.bind(ControllerApp.class).withSingle()
             ).aop(new AuthAspect()).initialize();
             //----analysis
-            logger.info("Analyzed App dependencies {}", String.join("\n", app.analysis().printShow()));
+            logger.info("Analyzed App dependencies {}", String.join("\n", app.analyze().printShow()));
 
             app.getInstance(JobEngineManager.class).loadRunners();
             app.getInstance(OperatorManager.class).loadPlugins();

sylph-main/src/main/java/ideal/sylph/main/server/SylphContextImpl.java

@@ -16,7 +16,7 @@
 package ideal.sylph.main.server;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.harbby.gadtry.easyspi.Module;
+import com.github.harbby.gadtry.spi.Module;
 import ideal.sylph.etl.Plugin;
 import ideal.sylph.main.service.JobEngineManager;
 import ideal.sylph.main.service.JobManager;

sylph-main/src/main/java/ideal/sylph/main/service/JobEngineImpl.java

@@ -37,6 +37,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -103,26 +104,29 @@ public Job compileJob(JobStore.DbJob dbJob, File jobWorkDir)
         String jobName = dbJob.getJobName();
         JobConfig jobConfig = MAPPER.readValue(dbJob.getConfig(), jobEngineHandle.getConfigParser());
 
-        List<URL> pluginJars = new ArrayList<>();
+        List<URL> dependJars = new ArrayList<>();
+        //---add engines jars
+        Collections.addAll(dependJars, getHandleClassLoader().getURLs());
+        //add plugin operator jars
         Flow flow = jobEngineHandle.formFlow(dbJob.getQueryText().getBytes(UTF_8));
         for (OperatorInfo dep : jobEngineHandle.parserFlowDepends(flow)) {
             if (dep.getModuleFile().isPresent()) {
                 for (File file : Files.listFiles(dep.getModuleFile().get(), true)) {
-                    pluginJars.add(file.toURI().toURL());
+                    dependJars.add(file.toURI().toURL());
                 }
             }
         }
 
         Supplier<Serializable> jobDAG = Lazys.goLazy(() -> {
             try {
-                return jobEngineHandle.formJob(jobName, flow, jobConfig, pluginJars);
+                return jobEngineHandle.formJob(jobName, flow, jobConfig, dependJars);
             }
             catch (Exception e) {
                 throw new SylphException(StandardErrorCode.JOB_BUILD_ERROR, e);
             }
         });
 
-        return new Job(dbJob.getId(), jobName, jobWorkDir, pluginJars, jobEngineHandle.getClass().getClassLoader(), jobDAG, jobConfig);
+        return new Job(dbJob.getId(), jobName, jobWorkDir, dependJars, jobEngineHandle.getClass().getClassLoader(), jobDAG, jobConfig);
     }
 
     private <T extends Annotation> T getAnnotation(JobEngineHandle jobActuator, Class<T> annotationClass)

sylph-main/src/main/java/ideal/sylph/main/service/JobEngineManager.java

@@ -17,8 +17,8 @@
 
 import com.github.harbby.gadtry.base.Closeables;
 import com.github.harbby.gadtry.base.Throwables;
-import com.github.harbby.gadtry.easyspi.ModuleLoader;
 import com.github.harbby.gadtry.ioc.Autowired;
+import com.github.harbby.gadtry.spi.ModuleLoader;
 import com.google.common.collect.ImmutableList;
 import ideal.sylph.etl.Operator;
 import ideal.sylph.main.server.ServerMainConfig;

sylph-main/src/main/java/ideal/sylph/main/service/OperatorManager.java

@@ -17,11 +17,11 @@
 
 import com.github.harbby.gadtry.base.Try;
 import com.github.harbby.gadtry.collection.ImmutableList;
-import com.github.harbby.gadtry.easyspi.Module;
-import com.github.harbby.gadtry.easyspi.ModuleLoader;
-import com.github.harbby.gadtry.easyspi.SecurityClassLoader;
-import com.github.harbby.gadtry.easyspi.VolatileClassLoader;
 import com.github.harbby.gadtry.ioc.Autowired;
+import com.github.harbby.gadtry.spi.Module;
+import com.github.harbby.gadtry.spi.ModuleLoader;
+import com.github.harbby.gadtry.spi.SecurityClassLoader;
+import com.github.harbby.gadtry.spi.VolatileClassLoader;
 import ideal.sylph.etl.Operator;
 import ideal.sylph.etl.Plugin;
 import ideal.sylph.etl.api.RealTimePipeline;

sylph-parser/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'antlr'
 
 dependencies {
   antlr "org.antlr:antlr4:4.7.1"
-  compile group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
+  implementation group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry
 
   //
-  compile(group: 'org.apache.calcite', name: 'calcite-core', version: '1.16.0') {
+  implementation(group: 'org.apache.calcite', name: 'calcite-core', version: '1.16.0') {
     exclude(module: 'guava')
     exclude(module: 'jsr305')
     exclude(module: 'jackson-core')

sylph-runners/build.gradle

@@ -7,7 +7,7 @@ subprojects {
   }
 
   dependencies {
-    compile(project(":sylph-api"))
+    implementation(project(":sylph-api"))
 
     compileOnly group: 'org.apache.hadoop', name: 'hadoop-client', version: deps.hadoop
     //compileOnly 'org.apache.flink:flink-shaded-hadoop-2-uber:2.8.3-10.0'
@@ -19,7 +19,7 @@ subprojects {
     into modules + "/conf"
   }
   task copyLibs(type: Copy, dependsOn: copyConf) {
-    from(configurations.runtime)
+    from(configurations.runtimeClasspath)
     into modules + "/lib"
     //include   '*.jar'
   }