You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2023/08/14 11:15:46 UTC

[xmlgraphics-batik] branch main updated: Update for release

This is an automated email from the ASF dual-hosted git repository.

ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-batik.git


The following commit(s) were added to refs/heads/main by this push:
     new 7304f93e7 Update for release
7304f93e7 is described below

commit 7304f93e74af0b6dd35442e82378a460a957bbf5
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Mon Aug 14 12:15:32 2023 +0100

    Update for release
---
 CHANGES                        | 7 +++++++
 batik-all/pom.xml              | 2 +-
 batik-anim/pom.xml             | 2 +-
 batik-awt-util/pom.xml         | 2 +-
 batik-bridge/pom.xml           | 2 +-
 batik-codec/pom.xml            | 2 +-
 batik-constants/pom.xml        | 2 +-
 batik-css/pom.xml              | 2 +-
 batik-dom/pom.xml              | 2 +-
 batik-ext/pom.xml              | 2 +-
 batik-extension/pom.xml        | 2 +-
 batik-gui-util/pom.xml         | 2 +-
 batik-gvt/pom.xml              | 2 +-
 batik-i18n/pom.xml             | 2 +-
 batik-parser/pom.xml           | 2 +-
 batik-rasterizer-ext/pom.xml   | 2 +-
 batik-rasterizer/pom.xml       | 2 +-
 batik-script/pom.xml           | 2 +-
 batik-shared-resources/pom.xml | 2 +-
 batik-slideshow/pom.xml        | 2 +-
 batik-squiggle-ext/pom.xml     | 2 +-
 batik-squiggle/pom.xml         | 2 +-
 batik-svg-dom/pom.xml          | 2 +-
 batik-svgbrowser/pom.xml       | 2 +-
 batik-svggen/pom.xml           | 2 +-
 batik-svgpp/pom.xml            | 2 +-
 batik-svgrasterizer/pom.xml    | 2 +-
 batik-swing/pom.xml            | 2 +-
 batik-test-old/pom.xml         | 2 +-
 batik-test-svg/pom.xml         | 2 +-
 batik-test-swing/pom.xml       | 2 +-
 batik-test/pom.xml             | 2 +-
 batik-transcoder/pom.xml       | 2 +-
 batik-ttf2svg/pom.xml          | 2 +-
 batik-util/pom.xml             | 2 +-
 batik-xml/pom.xml              | 2 +-
 build.xml                      | 4 ++--
 pom.xml                        | 2 +-
 38 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8cb9331dd..01e276840 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,13 @@ 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.17
+----
+
+BATIK-1346: Allow configuration of rhino whitelist
+BATIK-1347: Switch to empty whitelist for rhino
+BATIK-1349: Block loading external resource by default
+
 1.16
 ----
 
diff --git a/batik-all/pom.xml b/batik-all/pom.xml
index b87de566a..2a7c6a604 100644
--- a/batik-all/pom.xml
+++ b/batik-all/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-anim/pom.xml b/batik-anim/pom.xml
index 78bf534e3..86aa49183 100644
--- a/batik-anim/pom.xml
+++ b/batik-anim/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-awt-util/pom.xml b/batik-awt-util/pom.xml
index 860caaf9e..89eda7b91 100644
--- a/batik-awt-util/pom.xml
+++ b/batik-awt-util/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-bridge/pom.xml b/batik-bridge/pom.xml
index 9868efaa8..348b9f2c6 100644
--- a/batik-bridge/pom.xml
+++ b/batik-bridge/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-codec/pom.xml b/batik-codec/pom.xml
index a1b2f9971..2f9b31004 100644
--- a/batik-codec/pom.xml
+++ b/batik-codec/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-constants/pom.xml b/batik-constants/pom.xml
index 290ebe699..f5e6283b7 100644
--- a/batik-constants/pom.xml
+++ b/batik-constants/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-css/pom.xml b/batik-css/pom.xml
index 786070730..a635a110c 100644
--- a/batik-css/pom.xml
+++ b/batik-css/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-dom/pom.xml b/batik-dom/pom.xml
index 13dbf6bab..d168be05d 100644
--- a/batik-dom/pom.xml
+++ b/batik-dom/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-ext/pom.xml b/batik-ext/pom.xml
index 513189ea5..b5e61bba4 100644
--- a/batik-ext/pom.xml
+++ b/batik-ext/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-extension/pom.xml b/batik-extension/pom.xml
index 9b37a245f..58110281f 100644
--- a/batik-extension/pom.xml
+++ b/batik-extension/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-gui-util/pom.xml b/batik-gui-util/pom.xml
index 9d1b0202d..865b30840 100644
--- a/batik-gui-util/pom.xml
+++ b/batik-gui-util/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
 
diff --git a/batik-gvt/pom.xml b/batik-gvt/pom.xml
index 663f80af9..1bb3a5060 100644
--- a/batik-gvt/pom.xml
+++ b/batik-gvt/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-i18n/pom.xml b/batik-i18n/pom.xml
index d32938ae7..4fd1c52d6 100644
--- a/batik-i18n/pom.xml
+++ b/batik-i18n/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-parser/pom.xml b/batik-parser/pom.xml
index 4f837162b..1d69454a9 100644
--- a/batik-parser/pom.xml
+++ b/batik-parser/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-rasterizer-ext/pom.xml b/batik-rasterizer-ext/pom.xml
index b039cce29..863aff68e 100644
--- a/batik-rasterizer-ext/pom.xml
+++ b/batik-rasterizer-ext/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-rasterizer/pom.xml b/batik-rasterizer/pom.xml
index 6fcbbb023..13ddfe1e7 100644
--- a/batik-rasterizer/pom.xml
+++ b/batik-rasterizer/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-script/pom.xml b/batik-script/pom.xml
index 5b5a8a5c3..48c3d0540 100644
--- a/batik-script/pom.xml
+++ b/batik-script/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-shared-resources/pom.xml b/batik-shared-resources/pom.xml
index 9747055c5..c3919cade 100644
--- a/batik-shared-resources/pom.xml
+++ b/batik-shared-resources/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/batik-slideshow/pom.xml b/batik-slideshow/pom.xml
index ad1ffd273..26194da54 100644
--- a/batik-slideshow/pom.xml
+++ b/batik-slideshow/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-squiggle-ext/pom.xml b/batik-squiggle-ext/pom.xml
index b8afe906e..eaa309e78 100644
--- a/batik-squiggle-ext/pom.xml
+++ b/batik-squiggle-ext/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-squiggle/pom.xml b/batik-squiggle/pom.xml
index eea43bb1a..8ec729035 100644
--- a/batik-squiggle/pom.xml
+++ b/batik-squiggle/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-svg-dom/pom.xml b/batik-svg-dom/pom.xml
index d960f52bb..4176da327 100644
--- a/batik-svg-dom/pom.xml
+++ b/batik-svg-dom/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-svgbrowser/pom.xml b/batik-svgbrowser/pom.xml
index cabdf6502..ab1655963 100644
--- a/batik-svgbrowser/pom.xml
+++ b/batik-svgbrowser/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-svggen/pom.xml b/batik-svggen/pom.xml
index b2baf8bef..7a79fca77 100644
--- a/batik-svggen/pom.xml
+++ b/batik-svggen/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-svgpp/pom.xml b/batik-svgpp/pom.xml
index a0f7c1eda..702b705f0 100644
--- a/batik-svgpp/pom.xml
+++ b/batik-svgpp/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-svgrasterizer/pom.xml b/batik-svgrasterizer/pom.xml
index 481a244f6..9099d13ce 100644
--- a/batik-svgrasterizer/pom.xml
+++ b/batik-svgrasterizer/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-swing/pom.xml b/batik-swing/pom.xml
index 865eafbb7..f3bab7c13 100644
--- a/batik-swing/pom.xml
+++ b/batik-swing/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-test-old/pom.xml b/batik-test-old/pom.xml
index ede62fe81..299508b63 100644
--- a/batik-test-old/pom.xml
+++ b/batik-test-old/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-test-svg/pom.xml b/batik-test-svg/pom.xml
index 8815e7af6..d7f905310 100644
--- a/batik-test-svg/pom.xml
+++ b/batik-test-svg/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-test-swing/pom.xml b/batik-test-swing/pom.xml
index 4f85c7cf7..578e1e6e7 100644
--- a/batik-test-swing/pom.xml
+++ b/batik-test-swing/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-test/pom.xml b/batik-test/pom.xml
index 46c034702..09847f4c7 100644
--- a/batik-test/pom.xml
+++ b/batik-test/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-transcoder/pom.xml b/batik-transcoder/pom.xml
index ddcae7eb0..fdd3ced6f 100644
--- a/batik-transcoder/pom.xml
+++ b/batik-transcoder/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-ttf2svg/pom.xml b/batik-ttf2svg/pom.xml
index 6a446620d..5eb0fa466 100644
--- a/batik-ttf2svg/pom.xml
+++ b/batik-ttf2svg/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-util/pom.xml b/batik-util/pom.xml
index c7fd80124..661b41333 100644
--- a/batik-util/pom.xml
+++ b/batik-util/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/batik-xml/pom.xml b/batik-xml/pom.xml
index eb9cb1bce..358dfa651 100644
--- a/batik-xml/pom.xml
+++ b/batik-xml/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>batik</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/build.xml b/build.xml
index a791ebf4b..b925297db 100644
--- a/build.xml
+++ b/build.xml
@@ -83,8 +83,8 @@ To display the available targets type:
     </tstamp>
     <property name="Project"            value="Apache Batik" />
     <property name="project"            value="batik" />
-    <property name="year"               value="2022" />
-    <property name="version"            value="1.16.0-SNAPSHOT" />
+    <property name="year"               value="2023" />
+    <property name="version"            value="1.17.0-SNAPSHOT" />
     <property name="revisionType"       value="" />
     <property name="revisionNumber"     value="" />
     <property name="completeVersion"    value="${version}${revisionType}${revisionNumber}" />
diff --git a/pom.xml b/pom.xml
index 83fff5300..d7b707fdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>batik</artifactId>
-  <version>1.16.0-SNAPSHOT</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>XML Graphics Batik</description>
   <packaging>pom</packaging>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org