[ jEdit-commits ] SF.net SVN: jedit:[25655] jEdit/trunk

[<vam...@us...>]

Revision: 25655
          http://sourceforge.net/p/jedit/svn/25655
Author:   vampire0
Date:     2023-09-03 01:54:09 +0000 (Sun, 03 Sep 2023)
Log Message:
-----------
Make building possible when using Java 15+

Modified Paths:
--------------
    jEdit/trunk/build.xml
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/ivysettings.xml

Modified: jEdit/trunk/build.xml
===================================================================
--- jEdit/trunk/build.xml	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/build.xml	2023-09-03 01:54:09 UTC (rev 25655)
@@ -110,37 +110,6 @@
 	<target name="init-ivy"
 		depends="init,download-ivy"
 		unless="ivy.done">
-		<script language="javascript">
-			<![CDATA[
-				try {
-					var dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance()
-					dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
-					var document = dbf.newDocumentBuilder().parse('http://plugins.jedit.org/export/mirror_list.php')
-					var xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath()
-					var mirrors = xpath.evaluate('/MIRRORS/MIRROR/@ID', document, javax.xml.xpath.XPathConstants.NODESET)
-					var artifactPatterns = ''
-					for (i = 0; i < mirrors.getLength(); i++) {
-						artifactPatterns += '<artifact pattern="jar:http://'
-								    + mirrors.item(i).getTextContent()
-								    + '.dl.sourceforge.net/project/jedit-plugins/[artifact]/[revision]/[artifact]-[revision]-bin.zip!/[artifact].jar" />\n'
-					}
-					project.setUserProperty('jedit.plugins.artifact.patterns', artifactPatterns)
-				} catch(e) {
-					self.log('Error while retrieving mirror list, if plugins are not in Ivy cache, they will not be resolvable: ' + e, e, project.MSG_WARN)
-				}
-			]]>
-		</script>
-
-		<copy todir="${build.dir}"
-		      encoding="UTF-8"
-		      overwrite="true">
-			<fileset file="ivysettings.xml"/>
-			<filterset>
-				<filter token="jedit.plugins.artifact.patterns"
-					value="${jedit.plugins.artifact.patterns}"/>
-			</filterset>
-		</copy>
-
 		<property name="ivy.retrieve.pattern"
 			  value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
 		<taskdef resource="org/apache/ivy/ant/antlib.xml"
@@ -147,7 +116,6 @@
 			 classpath="${ivy.jar.file}"
 			 loaderref="ivy.loader"
 			 uri="antlib:org.apache.ivy.ant"/>
-		<ivy:settings file="${build.dir}/ivysettings.xml"/>
 	</target>
 
 	<target name="retrieve"

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/doc/CHANGES.txt	2023-09-03 01:54:09 UTC (rev 25655)
@@ -19,6 +19,8 @@
 
 - Status bar design updated with the ability to add widgets to the left and the right of the bar (Matthieu Casanova)
 
+- Make building possible when using Java 15+ (Björn Kautler)
+
 }}}
 {{{ API Changes
 

Modified: jEdit/trunk/ivysettings.xml
===================================================================
--- jEdit/trunk/ivysettings.xml	2023-09-02 18:08:43 UTC (rev 25654)
+++ jEdit/trunk/ivysettings.xml	2023-09-03 01:54:09 UTC (rev 25655)
@@ -26,7 +26,7 @@
 	<resolvers>
 		<ibiblio name="public" root="https://repo1.maven.org/maven2/" m2compatible="true"/>
 		<url name="jedit-plugins">
-			@jedit.plugins.artifact.patterns@
+			<artifact pattern="jar:https://sourceforge.net/projects/jedit-plugins/files/[artifact]/[revision]/[artifact]-[revision]-bin.zip/download!/[artifact].jar" />
 		</url>
 	</resolvers>
 	<modules>
@@ -33,7 +33,7 @@
 		<module organisation="org.jedit.plugins" resolver="jedit-plugins" />
 	</modules>
 
-	
+
 	<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
 	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
 	<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.