[NOID] Fixes more deprecated features

neo4j-contrib · Aug 8, 2023 · feb79ad · feb79ad
1 parent 099e073
commit feb79ad
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,9 @@ downloadLicenses {
 allprojects {
  group = 'org.neo4j.procedure'
  version = '4.4.0.21'
- archivesBaseName = 'apoc'
+ base {
+ archivesName = 'apoc'
+ }
  description = """neo4j-apoc-procedures"""
 }
 
@@ -59,6 +61,7 @@ subprojects {
  task mySourcesJar(type: Jar) {
  from sourceSets.main.allJava
  archiveClassifier = 'sources'
+ dependsOn(':full:generateGrammarSource')
  }
 
  task myJavadocJar(type: Jar) {

diff --git a/core/build.gradle b/core/build.gradle
@@ -12,7 +12,9 @@ spotless {
  }
 }
 
-archivesBaseName = "apoc"
+base {
+ archivesName = "apoc"
+}
 
 jar {
  manifest {

diff --git a/extra-dependencies/aws/build.gradle b/extra-dependencies/aws/build.gradle
@@ -8,7 +8,9 @@ java {
 }
 
 
-archivesBaseName = 'apoc-aws-dependencies'
+base {
+ archivesName = 'apoc-aws-dependencies'
+}
 description = """APOC AWS Dependencies"""
 
 jar {

diff --git a/extra-dependencies/bolt/build.gradle b/extra-dependencies/bolt/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-bolt-dependencies'
+base {
+ archivesName = 'apoc-bolt-dependencies'
+}
 description = """APOC Bolt Dependencies"""
 
 jar {

diff --git a/extra-dependencies/couchbase/build.gradle b/extra-dependencies/couchbase/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-couchbase-dependencies'
+base {
+ archivesName = 'apoc-couchbase-dependencies'
+}
 description = """APOC Couchbase Dependencies"""
 
 jar {

diff --git a/extra-dependencies/email/build.gradle b/extra-dependencies/email/build.gradle
@@ -8,7 +8,9 @@ java {
 }
 
 
-archivesBaseName = 'apoc-email-dependencies'
+base {
+ archivesName = 'apoc-email-dependencies'
+}
 description = """APOC Email Dependencies"""
 
 jar {

diff --git a/extra-dependencies/gcs/build.gradle b/extra-dependencies/gcs/build.gradle
@@ -8,7 +8,9 @@ java {
 }
 
 
-archivesBaseName = 'apoc-gcs-dependencies'
+base {
+ archivesName = 'apoc-gcs-dependencies'
+}
 description = """APOC Google Cloud Storage Dependencies"""
 
 jar {

diff --git a/extra-dependencies/hadoop/build.gradle b/extra-dependencies/hadoop/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-hadoop-dependencies'
+base {
+ archivesName = 'apoc-hadoop-dependencies'
+}
 description = """APOC Apache Hadoop Dependencies"""
 
 jar {

diff --git a/extra-dependencies/mongodb/build.gradle b/extra-dependencies/mongodb/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-mongodb-dependencies'
+base {
+ archivesName = 'apoc-mongodb-dependencies'
+}
 description = """APOC MongoDB Dependencies"""
 
 jar {

diff --git a/extra-dependencies/nlp/build.gradle b/extra-dependencies/nlp/build.gradle
@@ -8,7 +8,9 @@ java {
 }
 
 
-archivesBaseName = 'apoc-nlp-dependencies'
+base {
+ archivesName = 'apoc-nlp-dependencies'
+}
 description = """APOC NLP Dependencies"""
 
 jar {

diff --git a/extra-dependencies/redis/build.gradle b/extra-dependencies/redis/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-redis-dependencies'
+base {
+ archivesName = 'apoc-redis-dependencies'
+}
 description = """APOC Redis Dependencies"""
 
 jar {

diff --git a/extra-dependencies/selenium/build.gradle b/extra-dependencies/selenium/build.gradle
@@ -7,7 +7,9 @@ java {
  targetCompatibility = JavaVersion.VERSION_11
 }
 
-archivesBaseName = 'apoc-selenium-dependencies'
+base {
+ archivesName = 'apoc-selenium-dependencies'
+}
 description = """APOC Selenium Dependencies"""
 
 jar {

diff --git a/extra-dependencies/xls/build.gradle b/extra-dependencies/xls/build.gradle
@@ -8,7 +8,9 @@ java {
 }
 
 
-archivesBaseName = 'apoc-xls-dependencies'
+base {
+ archivesName = 'apoc-xls-dependencies'
+}
 description = """APOC XLS Dependencies"""
 
 jar {

diff --git a/full/build.gradle b/full/build.gradle
@@ -16,13 +16,15 @@ spotless {
  }
 }
 
-archivesBaseName = "apoc"
-
+base {
+ archivesName = "apoc"
+}
 
 jar {
  manifest {
  attributes 'Implementation-Version': archiveVersion
  }
+ archiveClassifier = 'core'
 }
 
 compileKotlin {
@@ -34,10 +36,6 @@ compileTestKotlin {
  dependsOn(generateTestGrammarSource)
 }
 
-mySourcesJar {
- dependsOn(generateGrammarSource)
-}
-
 generateGrammarSource {
  arguments += ["-package", "apoc.custom"]
 }

diff --git a/processor/build.gradle b/processor/build.gradle
@@ -4,7 +4,9 @@ plugins {
  id 'java'
 }
 
-archivesBaseName = "apoc-processor"
+base {
+ archivesName = "apoc-processor"
+}
 
 
 jar {