DEVEM-537 WIP

xenit-eu · Jul 19, 2023 · 3215eb4 · 3215eb4
1 parent 2119cfd
commit 3215eb4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/alfresco-dynamic-extensions-repo/build.gradle b/alfresco-dynamic-extensions-repo/build.gradle
@@ -60,10 +60,14 @@ subprojects {
         writer.println("project name: " + project.name);
         if (project.name.matches("alfresco-dynamic-extensions-repo-7\\d*")) {
             System.out.println("Using webscripts-70")
-            ampLib project(':webscripts:webscripts-70')
+            ampLib project(':webscripts:webscripts-70') {
+                project(":webscripts:webscripts-70").ext.set("acsPackageVersion", alfrescoVersion)
+            }
         } else if (project.name.matches("alfresco-dynamic-extensions-repo-6\\d*")) {
             System.out.println("Using webscripts-6x")
-            ampLib project(':webscripts:webscripts-6x')
+            ampLib project(':webscripts:webscripts-6x') {
+                project(":webscripts:webscripts-6x").ext.set("acsPackageVersion", alfrescoVersion)
+            }
         }
         else {
             System.out.println("Not using any webscripts subproject")

diff --git a/webscripts/build.gradle b/webscripts/build.gradle
@@ -41,12 +41,12 @@ dependencies {
     }
 }
 
-//subprojects {
-//    apply plugin: 'java'
-//    dependencies {
-////        System.out.println("acsPackageVersion integrations-tests subprojects: "+acsPackageVersion)
-//        compileOnly platform ("org.alfresco:acs-community-packaging:${acsPackageVersion}")
-//        compileOnly('org.json:json') { transitive = false }
-//        compileOnly("org.alfresco.surf:spring-webscripts")
-//    }
-//}
+subprojects {
+    apply plugin: 'java'
+    dependencies {
+        System.out.println("acsPackageVersion integrations-tests subprojects: "+acsPackageVersion)
+        compileOnly platform ("org.alfresco:acs-community-packaging:${acsPackageVersion}")
+        compileOnly('org.json:json') { transitive = false }
+        compileOnly("org.alfresco.surf:spring-webscripts")
+    }
+}
diff --git a/webscripts/webscripts-6x/build.gradle b/webscripts/webscripts-6x/build.gradle
diff --git a/webscripts/webscripts-70/build.gradle b/webscripts/webscripts-70/build.gradle