Context Navigation

← Previous Change
Next Change →

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

Timestamp:

2024-08-21T19:57:34+02:00 (4 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/includes/org/jopendocument/dom

Files:

: 22 edited

ChildCreator.java (modified) (1 diff)
ImmutableDocStyledNode.java (modified) (1 diff)
ODMeta.java (modified) (1 diff)
ODNode.java (modified) (1 diff)
ODPackage.java (modified) (1 diff)
ODUserDefinedMeta.java (modified) (1 diff)
ODXMLDocument.java (modified) (1 diff)
StyleDesc.java (modified) (1 diff)
StyleStyle.java (modified) (1 diff)
StyledNode.java (modified) (1 diff)
XMLVersion.java (modified) (1 diff)
spreadsheet/Cell.java (modified) (1 diff)
spreadsheet/CellStyle.java (modified) (1 diff)
spreadsheet/Column.java (modified) (1 diff)
spreadsheet/ColumnStyle.java (modified) (1 diff)
spreadsheet/Row.java (modified) (1 diff)
spreadsheet/RowStyle.java (modified) (1 diff)
spreadsheet/Sheet.java (modified) (1 diff)
spreadsheet/SpreadSheet.java (modified) (1 diff)
spreadsheet/Table.java (modified) (1 diff)
spreadsheet/TableCalcNode.java (modified) (1 diff)
spreadsheet/TableStyle.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-              r34152
+              r36315
 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

-              r30568
+              r36315
 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

-              r30568
+              r36315
 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

r28000	r36315
16	16	package org.jopendocument.dom;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19
20	20	/**

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

r34151	r36315
22	22	import java.util.Set;
23	23
24		import org.jdom.Document;
	24	import org.jdom2.Document;
25	25	import org.jopendocument.util.CopyUtils;
26	26	import org.jopendocument.util.FileUtils;

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

-              r28000
+              r36315
 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

-              r30568
+              r36315
 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

r30568	r36315
20	20	import java.util.List;
21	21
22		import org.jdom.Element;
	22	import org.jdom2.Element;
23	23	import org.jopendocument.util.CollectionMap;
24	24

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

-              r30568
+              r36315
 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

r28000	r36315
16	16	package org.jopendocument.dom;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19
20	20	/**

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

-              r30568
+              r36315
 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

-              r34151
+              r36315
 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

r28000	r36315
18	18	import java.util.Arrays;
19	19
20		import org.jdom.Element;
	20	import org.jdom2.Element;
21	21	import org.jopendocument.dom.ODPackage;
22	22	import org.jopendocument.dom.StyleDesc;

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

r28000	r36315
16	16	package org.jopendocument.dom.spreadsheet;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19	import org.jopendocument.dom.ODDocument;
20	20

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

r28000	r36315
16	16	package org.jopendocument.dom.spreadsheet;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19	import org.jopendocument.dom.ODPackage;
20	20	import org.jopendocument.dom.StyleDesc;

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

r30568	r36315
22	22	import java.util.List;
23	23
24		import org.jdom.Element;
	24	import org.jdom2.Element;
25	25	import org.jopendocument.dom.ODDocument;
26	26

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

r28000	r36315
16	16	package org.jopendocument.dom.spreadsheet;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19	import org.jopendocument.dom.ODPackage;
20	20	import org.jopendocument.dom.StyleDesc;

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

r28000	r36315
16	16	package org.jopendocument.dom.spreadsheet;
17	17
18		import org.jdom.Element;
	18	import org.jdom2.Element;
19	19
20	20	/**

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

-              r30568
+              r36315
 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

-              r30568
+              r36315
 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

-              r28000
+              r36315
 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

r28000	r36315
18	18	import java.util.Arrays;
19	19
20		import org.jdom.Element;
	20	import org.jdom2.Element;
21	21	import org.jopendocument.dom.ODPackage;
22	22	import org.jopendocument.dom.StyleDesc;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

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

Legend:

Download in other formats: