Merge pull request #4095 from reinhapa/update_aspectj

[upgrade] switch to aspectj version 1.9.8-M1
eXist-db · Dec 6, 2021 · deccc28 · deccc28
2 parents 21e968a + 6bc5e40
commit deccc28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/exist-core/src/main/java/org/exist/webstart/JnlpServlet.java b/exist-core/src/main/java/org/exist/webstart/JnlpServlet.java
@@ -29,6 +29,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;
+import java.util.function.Supplier;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -59,9 +60,9 @@ public void init() throws ServletException {
 
         final Optional<Path> libDir = or(
             Optional.ofNullable(System.getProperty("app.repo")).map(Paths::get).filter(Files::exists),
-            () -> or (
+            (Supplier<Optional<Path>>) () -> or ( // using explicit type declaration in order to circumvent AspectJ compiler bug, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=553623
                     Optional.ofNullable(System.getProperty("app.home")).map(Paths::get).map(p -> p.resolve("lib")).filter(Files::exists),
-                    () -> or (
+                    (Supplier<Optional<Path>>) () -> or ( // using explicit type declaration in order to circumvent AspectJ compiler bug, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=553623
                             Optional.ofNullable(System.getProperty("exist.home")).map(Paths::get).map(p -> p.resolve("lib")).filter(Files::exists),
                             () -> Optional.ofNullable(getServletContext().getRealPath("/")).map(Paths::get).map(p -> p.resolve("lib")).filter(Files::exists)
                     )
@@ -135,4 +136,4 @@ protected long getLastModified(final HttpServletRequest req) {
             return -1L;
         }
     }
-}
+}
diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
@@ -104,7 +104,7 @@
         <apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
         <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
         <apache.xmlrpc.version>3.1.3</apache.xmlrpc.version>
-        <aspectj.version>1.9.4</aspectj.version>
+        <aspectj.version>1.9.8.M1</aspectj.version>
         <exquery.distribution.version>0.2.0</exquery.distribution.version>
         <icu.version>59.1</icu.version>
         <izpack.version>5.1.3</izpack.version>