DEVEM-539 Reverted unintended changes; Fixed several ambiguity errors

xenit-eu · Nov 29, 2023 · 8fa03f7 · 8fa03f7
1 parent 70936db
commit 8fa03f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.../com/github/dynamicextensionsalfresco/gradle/integrationTest/DynamicExtensionJarTest.java b/.../com/github/dynamicextensionsalfresco/gradle/integrationTest/DynamicExtensionJarTest.java
@@ -14,6 +14,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import org.gradle.util.GradleVersion;
@@ -38,7 +39,7 @@ public void simpleProject() throws IOException {
 
         assertPath(Files::exists, jarFile);
 
-        FileSystem jarFs = FileSystems.newFileSystem(jarFile, null);
+        FileSystem jarFs = FileSystems.newFileSystem(jarFile, (ClassLoader) null);
 
         assertPath(Files::exists, jarFs.getPath("META-INF/MANIFEST.MF"));
         assertPath(Files::exists, jarFs.getPath("com/github/dynamicextensionsalfresco/examples/TemplateWebScript.class"));
@@ -70,7 +71,7 @@ public void bndConfig() throws IOException {
 
         assertPath(Files::exists, jarFile);
 
-        FileSystem jarFs = FileSystems.newFileSystem(jarFile, null);
+        FileSystem jarFs = FileSystems.newFileSystem(jarFile, (ClassLoader) null);
 
         assertPath(Files::exists, jarFs.getPath("META-INF/MANIFEST.MF"));
         assertPath(Files::exists, jarFs.getPath("com/github/dynamicextensionsalfresco/examples/TemplateWebScript.class"));
@@ -102,7 +103,7 @@ public void bndConfigOverwrites() throws IOException {
 
         assertPath(Files::exists, jarFile);
 
-        FileSystem jarFs = FileSystems.newFileSystem(jarFile, null);
+        FileSystem jarFs = FileSystems.newFileSystem(jarFile, (ClassLoader) null);
 
         assertPath(Files::exists, jarFs.getPath("META-INF/MANIFEST.MF"));
         assertPath(Files::exists, jarFs.getPath("com/github/dynamicextensionsalfresco/examples/TemplateWebScript.class"));
@@ -132,7 +133,7 @@ public void shadow() throws IOException {
 
         assertPath(Files::exists, jarFile);
 
-        FileSystem jarFs = FileSystems.newFileSystem(jarFile, null);
+        FileSystem jarFs = FileSystems.newFileSystem(jarFile, (ClassLoader) null);
 
         assertPath(Files::exists, jarFs.getPath("META-INF/MANIFEST.MF"));
         assertPath(Files::exists, jarFs.getPath("com/github/dynamicextensionsalfresco/examples/TemplateWebScript.class"));

diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 include 'annotations'
 
 include 'webscripts'
-//include 'webscripts:webscripts-50'
+include 'webscripts:webscripts-50'
 include 'webscripts:webscripts-70'
 
 include 'event-bus'
@@ -19,7 +19,7 @@ include 'control-panel'
 
 include 'gradle-plugin'
 
-def supportedAlfrescoVersions = ["74"] // "61", "62", "70", "71", "72", "73",
+def supportedAlfrescoVersions = [ "61", "62", "70", "71", "72", "73", "74"]
 def alfrescoDependentModules =
         [
                 'alfresco-dynamic-extensions-repo',