Merge branch 'java17'

rjolly · Feb 8, 2024 · 4290cb4 · 4290cb4
2 parents 97680c9 + 70c4098
commit 4290cb4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/build.xml b/build.xml
@@ -74,7 +74,7 @@
                 <exclude name="bin/**"/>
                 <exclude name="lib/javax.activation-1.2.0.jar"/>
                 <exclude name="lib/commons-codec-1.10.jar"/>
-                <exclude name="lib/ivy-2.4.0.jar"/>
+                <exclude name="lib/ivy-2.5.0.jar"/>
                 <exclude name="lib/javax.mail-1.6.2.jar"/>
                 <exclude name="linoleum.desktop"/>
                 <exclude name="readme.txt"/>

diff --git a/complete/ivy.xml b/complete/ivy.xml
@@ -15,9 +15,7 @@
     <dependencies>
         <dependency org="net.java.linoleum" name="console" rev="1.6" conf="runtime->default"/>
         <dependency org="net.java.linoleum" name="pdfview" rev="1.6" conf="runtime->default"/>
-        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="6.6.1.202309021850-r" conf="runtime->default">
-            <exclude org="commons-codec" module="commons-codec" name="*" type="*" ext="*" conf="" matcher="exact"/>
-        </dependency>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="6.6.1.202309021850-r" conf="runtime->default"/>
         <dependency org="commons-io" name="commons-io" rev="2.7" conf="runtime->default"/>
         <dependency org="com.googlecode.java-diff-utils" name="diffutils" rev="1.3.0" conf="runtime->default"/>
     </dependencies>

diff --git a/complete/pom.xml b/complete/pom.xml
@@ -23,12 +23,6 @@
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
       <version>6.6.1.202309021850-r</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/init.js b/init.js
@@ -323,9 +323,8 @@ function log(str) {
     }
 }
 
-function gc() {
-    java.lang.System.gc();
-}
+gc = java.lang.System.gc;
+decode = java.net.URLDecoder.decode;
 
 function version() {
     return java.lang.System.getProperty("java.version");

diff --git a/pkg/ivy.xml b/pkg/ivy.xml
@@ -10,7 +10,7 @@
         <conf name="runtime-test"/>
     </configurations>
     <dependencies>
-        <dependency org="org.apache.ivy" name="ivy" rev="2.4.0" conf="compile->master;runtime->default"/>
+        <dependency org="org.apache.ivy" name="ivy" rev="2.5.0" conf="compile->master;runtime->default"/>
         <dependency org="net.java.linoleum" name="application" rev="1.6" conf="compile->master;runtime->default"/>
         <dependency org="net.java.linoleum" name="jlfgr" rev="1_0" conf="runtime->default"/>
     </dependencies>