Changeset 36315 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2024-08-21T19:57:34+02:00 (7 months ago)

Author:

taylor.smock

Message:

Use pom.xml for dependencies when ivy.xml is not available

This removes ivy.xml from javafx and converts rasterfilters to use maven for
dependency management instead of jars in source control. In addition
rasterfilters dependencies were upgraded to the latest versions.

javafx now requires Java 17 since OpenJFX 21 requires Java 17+.

opendata was upgraded to use jdom2 (see
​https://github.com/JOSM/josm-plugins/security/dependabot/2)

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (4 diffs)
• includes/org/jopendocument/dom/ChildCreator.java (modified) (1 diff)
• includes/org/jopendocument/dom/ImmutableDocStyledNode.java (modified) (1 diff)
• includes/org/jopendocument/dom/ODMeta.java (modified) (1 diff)
• includes/org/jopendocument/dom/ODNode.java (modified) (1 diff)
• includes/org/jopendocument/dom/ODPackage.java (modified) (1 diff)
• includes/org/jopendocument/dom/ODUserDefinedMeta.java (modified) (1 diff)
• includes/org/jopendocument/dom/ODXMLDocument.java (modified) (1 diff)
• includes/org/jopendocument/dom/StyleDesc.java (modified) (1 diff)
• includes/org/jopendocument/dom/StyleStyle.java (modified) (1 diff)
• includes/org/jopendocument/dom/StyledNode.java (modified) (1 diff)
• includes/org/jopendocument/dom/XMLVersion.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/Cell.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/CellStyle.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/Column.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/ColumnStyle.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/Row.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/RowStyle.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/Sheet.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/Table.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/TableCalcNode.java (modified) (1 diff)
• includes/org/jopendocument/dom/spreadsheet/TableStyle.java (modified) (1 diff)
• lib (deleted)
• pom.xml (modified) (1 diff)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="opendata" default="dist" basedir=".">
+<project name="opendata" default="dist" basedir="." xmlns:mvn="antlib:org.apache.maven.resolver.ant">
     <property name="plugin.main.version" value="18723"/>
     <property name="plugin.author" value="Don-vip"/>
@@ -26 +26 @@
     <property name="ejml" location="${plugin.dist.dir}/ejml.jar"/>
     <property name="geotools" location="${plugin.dist.dir}/geotools.jar"/>
-    
+
     <!--
     **********************************************************
@@ -41 +41 @@
     **********************************************************
     -->
-    <target name="compile_jopendoc" depends="init">
+    <target name="compile_jopendoc" depends="init, fetch_dependencies">
         <echo message="compiling JOpenDocument ... "/>
         <javac srcdir="includes/org/jopendocument" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" release="${java.lang.version}">
             <classpath>
                 <!-- JDOM is required in an older version than the one embedded in geotools jar -->
-                <pathelement location="lib/jdom-1.1.3.jar"/>
+                <pathelement location="lib/jdom2-2.0.6.1.jar"/>
                 <pathelement location="${apache-commons}"/>
             </classpath>
@@ -78 +78 @@
     **********************************************************
     -->
-    <target name="pre-compile" depends="init, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip"/>
+    <target name="pre-compile" depends="init, fetch_dependencies, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip"/>
     
     <target name="xjc_neptune" depends="init, -jaxb_linux, -jaxb_windows" unless="jaxb.notRequired">

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ChildCreator.java

@@ -20 +20 @@
 import java.util.ListIterator;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ImmutableDocStyledNode.java

@@ -19 +19 @@
 import java.util.Set;
 
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 
 public class ImmutableDocStyledNode<S extends StyleStyle, D extends ODDocument> extends StyledNode<S, D> {

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODMeta.java

@@ -24 +24 @@
 import java.util.Map;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODNode.java

@@ -16 +16 @@
 package org.jopendocument.dom;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODPackage.java

@@ -22 +22 @@
 import java.util.Set;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.jopendocument.util.CopyUtils;
 import org.jopendocument.util.FileUtils;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODUserDefinedMeta.java

@@ -19 +19 @@
 import java.util.List;
 
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 // eg <meta:user-defined meta:name="countOfSomething">5.2</meta:user-defined>

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/ODXMLDocument.java

@@ -24 +24 @@
 import java.util.Map;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleDesc.java

@@ -20 +20 @@
 import java.util.List;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.util.CollectionMap;
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyleStyle.java

@@ -19 +19 @@
 import java.util.Map;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.jopendocument.dom.spreadsheet.CellStyle;
 import org.jopendocument.dom.spreadsheet.ColumnStyle;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/StyledNode.java

@@ -16 +16 @@
 package org.jopendocument.dom;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/XMLVersion.java

@@ -19 +19 @@
 import java.util.Map;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Cell.java

@@ -25 +25 @@
 import java.util.regex.Pattern;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Text;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
 import org.jopendocument.dom.ODDocument;
 import org.jopendocument.dom.ODValueType;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/CellStyle.java

@@ -18 +18 @@
 import java.util.Arrays;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODPackage;
 import org.jopendocument.dom.StyleDesc;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Column.java

@@ -16 +16 @@
 package org.jopendocument.dom.spreadsheet;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODDocument;
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/ColumnStyle.java

@@ -16 +16 @@
 package org.jopendocument.dom.spreadsheet;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODPackage;
 import org.jopendocument.dom.StyleDesc;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Row.java

@@ -22 +22 @@
 import java.util.List;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODDocument;
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/RowStyle.java

@@ -16 +16 @@
 package org.jopendocument.dom.spreadsheet;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODPackage;
 import org.jopendocument.dom.StyleDesc;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Sheet.java

@@ -16 +16 @@
 package org.jopendocument.dom.spreadsheet;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/SpreadSheet.java

@@ -21 +21 @@
 import java.util.NoSuchElementException;
 
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODDocument;
 import org.jopendocument.dom.ODPackage;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/Table.java

@@ -20 +20 @@
 import java.util.ListIterator;
 
-import org.jdom.Attribute;
-import org.jdom.Element;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODDocument;
 import org.jopendocument.util.Tuple2;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/TableCalcNode.java

@@ -16 +16 @@
 package org.jopendocument.dom.spreadsheet;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 import org.jopendocument.dom.ImmutableDocStyledNode;
 import org.jopendocument.dom.ODDocument;

applications/editors/josm/plugins/opendata/includes/org/jopendocument/dom/spreadsheet/TableStyle.java

@@ -18 +18 @@
 import java.util.Arrays;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.jopendocument.dom.ODPackage;
 import org.jopendocument.dom.StyleDesc;

applications/editors/josm/plugins/opendata/pom.xml

@@ -71 +71 @@
             <scope>provided</scope>
         </dependency>
-        <!-- Needed to compile jopendocument, provided by geotools later -->
+        <!-- Needed to compile jopendocument, not currently provided by geotools -->
         <dependency>
             <groupId>org.jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.1.3</version>
-            <scope>provided</scope>
+            <artifactId>jdom2</artifactId>
+            <version>2.0.6.1</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>