svn commit: r1904067 - in /xmlgraphics/batik/trunk: CHANGES batik-all/pom.xml batik-shared-resources/src/main/resources/NOTICE

[ss...@apache.org]

Author: ssteiner
Date: Wed Sep 14 10:14:21 2022
New Revision: 1904067

URL: http://svn.apache.org/viewvc?rev=1904067&view=rev
Log:
BATIK-1299: Make all contents match 1.14 dependancies

Modified:
    xmlgraphics/batik/trunk/CHANGES
    xmlgraphics/batik/trunk/batik-all/pom.xml
    xmlgraphics/batik/trunk/batik-shared-resources/src/main/resources/NOTICE

Modified: xmlgraphics/batik/trunk/CHANGES
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/CHANGES?rev=1904067&r1=1904066&r2=1904067&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/CHANGES (original)
+++ xmlgraphics/batik/trunk/CHANGES Wed Sep 14 10:14:21 2022
@@ -4,6 +4,17 @@ Change Log
 The following log records some of the most important changes.
 Bug fixing is an ongoing task, so it is implied in all sub-releases.
 
+1.14 -> 1.15
+------------
+
+BATIK-1260: Java 11 module error
+BATIK-1321: Remove Xerces
+BATIK-1299: Batik-all jar has all classes so should not pull other jars also
+BATIK-1329: Remove xalan
+BATIK-1331: Jar url should be blocked by DefaultExternalResourceSecurity
+BATIK-1333: Block external resource before calling fop
+BATIK-1335: Jar url should be blocked by DefaultScriptSecurity
+
 1.13 -> 1.14
 ------------
 

Modified: xmlgraphics/batik/trunk/batik-all/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-all/pom.xml?rev=1904067&r1=1904066&r2=1904067&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-all/pom.xml (original)
+++ xmlgraphics/batik/trunk/batik-all/pom.xml Wed Sep 14 10:14:21 2022
@@ -210,6 +210,22 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>${xmlapis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis-ext</artifactId>
+      <version>${xmlapisext.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>xmlgraphics-commons</artifactId>
+      <version>${xmlgraphics.commons.version}</version>
+    </dependency>    
   </dependencies>
 
   <build>

Modified: xmlgraphics/batik/trunk/batik-shared-resources/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-shared-resources/src/main/resources/NOTICE?rev=1904067&r1=1904066&r2=1904067&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-shared-resources/src/main/resources/NOTICE (original)
+++ xmlgraphics/batik/trunk/batik-shared-resources/src/main/resources/NOTICE Wed Sep 14 10:14:21 2022
@@ -1,5 +1,5 @@
 Apache Batik
-Copyright 1999-2020 The Apache Software Foundation
+Copyright 1999-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).