You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by lb...@apache.org on 2015/03/05 14:13:54 UTC

svn commit: r1664337 - in /xmlgraphics/batik/trunk: ./ lib/ resources/org/apache/batik/apps/rasterizer/resources/ resources/org/apache/batik/apps/svgbrowser/resources/ sources/

Author: lbernardo
Date: Thu Mar  5 13:13:53 2015
New Revision: 1664337

URL: http://svn.apache.org/r1664337
Log:
replaced xalan-2.6.0 by xalan-2.7.0

Added:
    xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.7.0.txt
    xmlgraphics/batik/trunk/lib/README.xalan-2.7.0.txt
    xmlgraphics/batik/trunk/lib/xalan-2.7.0.jar   (with props)
Removed:
    xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.6.0.txt
    xmlgraphics/batik/trunk/lib/README.xalan-2.6.0.txt
    xmlgraphics/batik/trunk/lib/xalan-2.6.0.jar
Modified:
    xmlgraphics/batik/trunk/.classpath
    xmlgraphics/batik/trunk/build.xml
    xmlgraphics/batik/trunk/buildpom.sh
    xmlgraphics/batik/trunk/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref
    xmlgraphics/batik/trunk/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref
    xmlgraphics/batik/trunk/sources/batik-bridge.pom.template
    xmlgraphics/batik/trunk/sources/batik-dom.pom.template

Modified: xmlgraphics/batik/trunk/.classpath
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/.classpath?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/.classpath (original)
+++ xmlgraphics/batik/trunk/.classpath Thu Mar  5 13:13:53 2015
@@ -9,7 +9,7 @@
 	<classpathentry kind="lib" path="lib/xml-apis-ext.jar"/>
 	<classpathentry excluding="**/.svn/" kind="src" path="resources"/>
 	<classpathentry excluding="**/.svn/" kind="src" path="test-resources"/>
-	<classpathentry kind="lib" path="lib/xalan-2.6.0.jar"/>
+	<classpathentry kind="lib" path="lib/xalan-2.7.0.jar"/>
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-svn-trunk.jar"/>
 	<classpathentry kind="lib" path="lib/fop-transcoder-allinone-svn-trunk.jar"/>
 	<classpathentry kind="output" path="classes"/>

Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Thu Mar  5 13:13:53 2015
@@ -1589,7 +1589,7 @@ JAVA=/usr/bin/java
         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.6.0.jar" />
+        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
@@ -1647,7 +1647,7 @@ JAVA=/usr/bin/java
         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.6.0.jar" />
+        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
@@ -1750,7 +1750,7 @@ JAVA=/usr/bin/java
         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.6.0.jar" />
+        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
         <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
@@ -1863,7 +1863,7 @@ JAVA=/usr/bin/java
         <attribute name="Class-Path" value="${project}-rasterizer-${completeVersion}.jar" />
         <attribute name="Class-Path" value="${project}-svgpp-${completeVersion}.jar" />
         <attribute name="Class-Path" value="lib/xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="lib/xalan-2.6.0.jar" />
+        <attribute name="Class-Path" value="lib/xalan-2.7.0.jar" />
         <attribute name="Class-Path" value="lib/xml-apis.jar" />
         <attribute name="Class-Path" value="lib/xml-apis-ext.jar" />
         <attribute name="Class-Path" value="lib/js.jar" />

Modified: xmlgraphics/batik/trunk/buildpom.sh
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/buildpom.sh?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/buildpom.sh (original)
+++ xmlgraphics/batik/trunk/buildpom.sh Thu Mar  5 13:13:53 2015
@@ -155,7 +155,7 @@ echo '<?xml version="1.0"?>
   </organization>
 
   <dependencies>'
-grep jar checkdeps/dot/$1-svn-trunk.jar.dot | grep -v java | grep org.apache.batik | awk '{print $4}' | sort -u | sed s/xalan-2.6.0/xalan/g | sed s/'-svn-trunk.jar)";'//g | sed s/'.jar)";'//g | sed s/'('//g | awk '{version = "@version@"; groupId = "org.apache.xmlgraphics"; if ($1 == "xml-apis" || $1 == "xml-apis-ext") {version = "1.3.04"; groupId = "xml-apis"} else if ($1 == "xmlgraphics-commons") {version = "@xgcVersion@"} else if ($1 == "xalan") {version = "2.6.0"; groupId = "xalan";}; printf("    <dependency>\n      <groupId>%s</groupId>\n      <artifactId>%s</artifactId>\n      <version>%s</version>\n    </dependency>\n", groupId, $1, version);}'
+grep jar checkdeps/dot/$1-svn-trunk.jar.dot | grep -v java | grep org.apache.batik | awk '{print $4}' | sort -u | sed s/xalan-2.7.0/xalan/g | sed s/'-svn-trunk.jar)";'//g | sed s/'.jar)";'//g | sed s/'('//g | awk '{version = "@version@"; groupId = "org.apache.xmlgraphics"; if ($1 == "xml-apis" || $1 == "xml-apis-ext") {version = "1.3.04"; groupId = "xml-apis"} else if ($1 == "xmlgraphics-commons") {version = "@xgcVersion@"} else if ($1 == "xalan") {version = "2.7.0"; groupId = "xalan";}; printf("    <dependency>\n      <groupId>%s</groupId>\n      <artifactId>%s</artifactId>\n      <version>%s</version>\n    </dependency>\n", groupId, $1, version);}'
 echo '  </dependencies>
 </project>'
 

Added: xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.7.0.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.7.0.txt?rev=1664337&view=auto
==============================================================================
--- xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.7.0.txt (added)
+++ xmlgraphics/batik/trunk/lib/LICENSE.xalan-2.7.0.txt Thu Mar  5 13:13:53 2015
@@ -0,0 +1,2 @@
+The xalan-2.7.0.jar file is licensed under the Apache License 2.0, which
+can be found in the distribution root directory in the LICENSE file.

Added: xmlgraphics/batik/trunk/lib/README.xalan-2.7.0.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/lib/README.xalan-2.7.0.txt?rev=1664337&view=auto
==============================================================================
--- xmlgraphics/batik/trunk/lib/README.xalan-2.7.0.txt (added)
+++ xmlgraphics/batik/trunk/lib/README.xalan-2.7.0.txt Thu Mar  5 13:13:53 2015
@@ -0,0 +1,4 @@
+The xalan-2.7.0.jar file comes from the Apache Xalan project
+(http://xml.apache.org/xalan-j/), and is licensed under the
+Apache License 2.0, which can be found in the distribution root directory
+in the LICENSE file.

Added: xmlgraphics/batik/trunk/lib/xalan-2.7.0.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/lib/xalan-2.7.0.jar?rev=1664337&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/batik/trunk/lib/xalan-2.7.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Modified: xmlgraphics/batik/trunk/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref (original)
+++ xmlgraphics/batik/trunk/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref Thu Mar  5 13:13:53 2015
@@ -26,7 +26,7 @@ grant codeBase "${app.jar.base}/@jarsLib
   permission java.security.AllPermission;
 };
 
-grant codeBase "${app.jar.base}/@jarsLibDir@xalan-2.6.0.jar" {
+grant codeBase "${app.jar.base}/@jarsLibDir@xalan-2.7.0.jar" {
   permission java.security.AllPermission;
 };
 

Modified: xmlgraphics/batik/trunk/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref (original)
+++ xmlgraphics/batik/trunk/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref Thu Mar  5 13:13:53 2015
@@ -26,7 +26,7 @@ grant codeBase "${app.jar.base}/@jarsLib
   permission java.security.AllPermission;
 };
 
-grant codeBase "${app.jar.base}/@jarsLibDir@xalan-2.6.0.jar" {
+grant codeBase "${app.jar.base}/@jarsLibDir@xalan-2.7.0.jar" {
   permission java.security.AllPermission;
 };
 

Modified: xmlgraphics/batik/trunk/sources/batik-bridge.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-bridge.pom.template?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-bridge.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-bridge.pom.template Thu Mar  5 13:13:53 2015
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.6.0</version>
+      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>

Modified: xmlgraphics/batik/trunk/sources/batik-dom.pom.template
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/batik-dom.pom.template?rev=1664337&r1=1664336&r2=1664337&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/batik-dom.pom.template (original)
+++ xmlgraphics/batik/trunk/sources/batik-dom.pom.template Thu Mar  5 13:13:53 2015
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.6.0</version>
+      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>