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 ga...@apache.org on 2016/02/26 18:21:38 UTC
svn commit: r1732527 - in /xmlgraphics/batik/branches/maven: ./ batik-anim/
batik-awt-util/ batik-bridge/ batik-codec/ batik-constants/ batik-css/
batik-dom/ batik-ext/ batik-extension/ batik-gui-util/ batik-gvt/
batik-i18n/ batik-parser/ batik-rasteri...
Author: gadams
Date: Fri Feb 26 17:21:37 2016
New Revision: 1732527
URL: http://svn.apache.org/viewvc?rev=1732527&view=rev
Log:
Ensure that ant jars all-jar targets remain viable; add LICENSE/NOTICES to maven built artifacts; other cleanup.
Removed:
xmlgraphics/batik/branches/maven/build.sh
xmlgraphics/batik/branches/maven/builddeps.sh
xmlgraphics/batik/branches/maven/buildpom.sh
xmlgraphics/batik/branches/maven/buildpoms.sh
xmlgraphics/batik/branches/maven/forrest.properties
xmlgraphics/batik/branches/maven/sources/org
Modified:
xmlgraphics/batik/branches/maven/batik-anim/pom.xml
xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml
xmlgraphics/batik/branches/maven/batik-bridge/pom.xml
xmlgraphics/batik/branches/maven/batik-codec/pom.xml
xmlgraphics/batik/branches/maven/batik-constants/pom.xml
xmlgraphics/batik/branches/maven/batik-css/pom.xml
xmlgraphics/batik/branches/maven/batik-dom/pom.xml
xmlgraphics/batik/branches/maven/batik-ext/pom.xml
xmlgraphics/batik/branches/maven/batik-extension/pom.xml
xmlgraphics/batik/branches/maven/batik-gui-util/pom.xml
xmlgraphics/batik/branches/maven/batik-gvt/pom.xml
xmlgraphics/batik/branches/maven/batik-i18n/pom.xml
xmlgraphics/batik/branches/maven/batik-parser/pom.xml
xmlgraphics/batik/branches/maven/batik-rasterizer-ext/pom.xml
xmlgraphics/batik/branches/maven/batik-rasterizer/pom.xml
xmlgraphics/batik/branches/maven/batik-script/pom.xml
xmlgraphics/batik/branches/maven/batik-slideshow/pom.xml
xmlgraphics/batik/branches/maven/batik-squiggle-ext/pom.xml
xmlgraphics/batik/branches/maven/batik-squiggle/pom.xml
xmlgraphics/batik/branches/maven/batik-svg-dom/pom.xml
xmlgraphics/batik/branches/maven/batik-svgbrowser/pom.xml
xmlgraphics/batik/branches/maven/batik-svggen/pom.xml
xmlgraphics/batik/branches/maven/batik-svgpp/pom.xml
xmlgraphics/batik/branches/maven/batik-svgrasterizer/pom.xml
xmlgraphics/batik/branches/maven/batik-swing/pom.xml
xmlgraphics/batik/branches/maven/batik-test-svg/pom.xml
xmlgraphics/batik/branches/maven/batik-test-swing/pom.xml
xmlgraphics/batik/branches/maven/batik-test-util/pom.xml
xmlgraphics/batik/branches/maven/batik-test/pom.xml
xmlgraphics/batik/branches/maven/batik-transcoder/pom.xml
xmlgraphics/batik/branches/maven/batik-ttf2svg/pom.xml
xmlgraphics/batik/branches/maven/batik-util/pom.xml
xmlgraphics/batik/branches/maven/batik-xml/pom.xml
xmlgraphics/batik/branches/maven/build.xml
xmlgraphics/batik/branches/maven/pom.xml
Modified: xmlgraphics/batik/branches/maven/batik-anim/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-anim/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-anim/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-anim/pom.xml Fri Feb 26 17:21:37 2016
@@ -77,4 +77,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml Fri Feb 26 17:21:37 2016
@@ -47,4 +47,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-bridge/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-bridge/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-bridge/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-bridge/pom.xml Fri Feb 26 17:21:37 2016
@@ -97,4 +97,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-codec/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-codec/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-codec/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-codec/pom.xml Fri Feb 26 17:21:37 2016
@@ -69,6 +69,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-constants/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-constants/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-constants/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-constants/pom.xml Fri Feb 26 17:21:37 2016
@@ -34,4 +34,20 @@
<version>1.9.0-SNAPSHOT</version>
</parent>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-css/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-css/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-css/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-css/pom.xml Fri Feb 26 17:21:37 2016
@@ -52,4 +52,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-dom/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-dom/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-dom/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-dom/pom.xml Fri Feb 26 17:21:37 2016
@@ -72,4 +72,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-ext/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-ext/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-ext/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-ext/pom.xml Fri Feb 26 17:21:37 2016
@@ -34,4 +34,20 @@
<version>1.9.0-SNAPSHOT</version>
</parent>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-extension/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-extension/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-extension/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-extension/pom.xml Fri Feb 26 17:21:37 2016
@@ -92,4 +92,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-gui-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-gui-util/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-gui-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-gui-util/pom.xml Fri Feb 26 17:21:37 2016
@@ -48,4 +48,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-gvt/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-gvt/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-gvt/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-gvt/pom.xml Fri Feb 26 17:21:37 2016
@@ -47,4 +47,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-i18n/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-i18n/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-i18n/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-i18n/pom.xml Fri Feb 26 17:21:37 2016
@@ -34,4 +34,20 @@
<version>1.9.0-SNAPSHOT</version>
</parent>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-parser/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-parser/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-parser/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-parser/pom.xml Fri Feb 26 17:21:37 2016
@@ -57,4 +57,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-rasterizer-ext/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-rasterizer-ext/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-rasterizer-ext/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-rasterizer-ext/pom.xml Fri Feb 26 17:21:37 2016
@@ -62,6 +62,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-rasterizer/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-rasterizer/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-rasterizer/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-rasterizer/pom.xml Fri Feb 26 17:21:37 2016
@@ -57,6 +57,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-script/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-script/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-script/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-script/pom.xml Fri Feb 26 17:21:37 2016
@@ -69,6 +69,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-slideshow/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-slideshow/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-slideshow/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-slideshow/pom.xml Fri Feb 26 17:21:37 2016
@@ -52,4 +52,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-squiggle-ext/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-squiggle-ext/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-squiggle-ext/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-squiggle-ext/pom.xml Fri Feb 26 17:21:37 2016
@@ -62,6 +62,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-squiggle/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-squiggle/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-squiggle/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-squiggle/pom.xml Fri Feb 26 17:21:37 2016
@@ -57,6 +57,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-svg-dom/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-svg-dom/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-svg-dom/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-svg-dom/pom.xml Fri Feb 26 17:21:37 2016
@@ -72,4 +72,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-svgbrowser/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-svgbrowser/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-svgbrowser/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-svgbrowser/pom.xml Fri Feb 26 17:21:37 2016
@@ -82,4 +82,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-svggen/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-svggen/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-svggen/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-svggen/pom.xml Fri Feb 26 17:21:37 2016
@@ -47,4 +47,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-svgpp/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-svgpp/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-svgpp/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-svgpp/pom.xml Fri Feb 26 17:21:37 2016
@@ -47,4 +47,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-svgrasterizer/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-svgrasterizer/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-svgrasterizer/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-svgrasterizer/pom.xml Fri Feb 26 17:21:37 2016
@@ -52,4 +52,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-swing/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-swing/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-swing/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-swing/pom.xml Fri Feb 26 17:21:37 2016
@@ -92,4 +92,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-test-svg/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-test-svg/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-test-svg/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-test-svg/pom.xml Fri Feb 26 17:21:37 2016
@@ -52,4 +52,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-test-swing/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-test-swing/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-test-swing/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-test-swing/pom.xml Fri Feb 26 17:21:37 2016
@@ -47,4 +47,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-test-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-test-util/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-test-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-test-util/pom.xml Fri Feb 26 17:21:37 2016
@@ -48,4 +48,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-test/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-test/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-test/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-test/pom.xml Fri Feb 26 17:21:37 2016
@@ -59,7 +59,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
-
</project>
Modified: xmlgraphics/batik/branches/maven/batik-transcoder/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-transcoder/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-transcoder/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-transcoder/pom.xml Fri Feb 26 17:21:37 2016
@@ -81,4 +81,21 @@
<version>${xmlapis.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-ttf2svg/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-ttf2svg/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-ttf2svg/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-ttf2svg/pom.xml Fri Feb 26 17:21:37 2016
@@ -42,4 +42,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-util/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-util/pom.xml Fri Feb 26 17:21:37 2016
@@ -73,6 +73,19 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
</project>
Modified: xmlgraphics/batik/branches/maven/batik-xml/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-xml/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-xml/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-xml/pom.xml Fri Feb 26 17:21:37 2016
@@ -42,4 +42,20 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/build.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/build.xml (original)
+++ xmlgraphics/batik/branches/maven/build.xml Fri Feb 26 17:21:37 2016
@@ -1358,7 +1358,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/Version.class"/>
<include name="${package-prefix}/util/resources/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-util/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/util/resources/**"/>
<include name="${package-prefix}/util/io/resources/**"/>
</fileset>
@@ -1381,7 +1381,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/ext/swing/**/*.class"/>
<exclude name="${package-prefix}/ext/awt/image/codec/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-awt-util/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/ext/awt/image/**"/>
<include name="${package-prefix}/ext/swing/**"/>
<exclude name="${package-prefix}/ext/awt/image/codec/**/properties"/>
@@ -1410,7 +1410,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/ext/awt/image/codec/jpeg/*.class"
if="sun-codecs.present"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-codec/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/ext/awt/image/codec/**/properties"/>
<include name="META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter"/>
<include name="META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry"/>
@@ -1432,7 +1432,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/svggen/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svggen/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/svggen/font/resources/**"/>
</fileset>
</jar>
@@ -1455,7 +1455,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/ext/awt/g2d/*.class"/>
<include name="${package-prefix}/util/*Constants.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svggen/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/svggen/font/resources/**"/>
</fileset>
</jar>
@@ -1475,7 +1475,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/util/gui/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-gui-util/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/util/gui/**/resources/**"/>
</fileset>
</jar>
@@ -1499,7 +1499,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/dom/util/*.class"/>
<include name="${package-prefix}/dom/xbl/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-dom/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/dom/resources/*"/>
<include name="${package-prefix}/dom/events/resources/**"/>
<include name="${package-prefix}/dom/traversal/resources/**"/>
@@ -1530,7 +1530,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/css/engine/value/svg12/*.class"/>
<include name="${package-prefix}/css/parser/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-css/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/css/dom/resources/**"/>
<include name="${package-prefix}/css/engine/resources/**"/>
<include name="${package-prefix}/css/engine/sac/resources/**"/>
@@ -1557,7 +1557,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/dom/svg/*.class"/>
<include name="${package-prefix}/dom/svg12/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svg-dom/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/dom/svg/resources/**"/>
<include name="${package-prefix}/dom/svg12/resources/**"/>
</fileset>
@@ -1578,7 +1578,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/gvt/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-gvt/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/gvt/**/resources/*"/>
</fileset>
</jar>
@@ -1598,7 +1598,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/parser/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-parser/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/parser/**/resources/*"/>
</fileset>
</jar>
@@ -1618,7 +1618,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/script/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-script/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/script/**/resources/*"/>
<include name="META-INF/services/org.apache.batik.script.InterpreterFactory"/>
</fileset>
@@ -1639,7 +1639,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/transcoder/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-transcoder/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/transcoder/**/resources/*"/>
</fileset>
</jar>
@@ -1658,7 +1658,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/xml/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-xml/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/xml/**/resources/*"/>
</fileset>
</jar>
@@ -1677,7 +1677,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/bridge/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-bridge/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/bridge/BrokenLink.svg"/>
<include name="${package-prefix}/bridge/**/resources/*"/>
</fileset>
@@ -1697,7 +1697,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/swing/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-swing/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/swing/**/resources/*"/>
</fileset>
</jar>
@@ -1719,7 +1719,7 @@ JAVA=/usr/bin/java
<include name="${package-prefix}/anim/timing/*.class"/>
<include name="${package-prefix}/anim/values/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-anim/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/anim/**/resources/*"/>
</fileset>
</jar>
@@ -1735,15 +1735,12 @@ JAVA=/usr/bin/java
<attribute name="Build-Id" value="${build.id}"/>
</manifest>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
- <fileset dir="${resources}" excludes="**/.svn/">
- <include name="META-INF/services/org.apache.batik.bridge.BridgeExtension"/>
- <include name="META-INF/services/org.apache.batik.dom.DomExtension"/>
- </fileset>
<fileset dir="${dest}">
<include name="${package-prefix}/extension/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
- <include name="${package-prefix}/extension/**/resources/*"/>
+ <fileset dir="batik-extension/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/org.apache.batik.bridge.BridgeExtension"/>
+ <include name="META-INF/services/org.apache.batik.dom.DomExtension"/>
</fileset>
</jar>
</target>
@@ -1779,7 +1776,7 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/apps/svgpp/**/*.class"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svgpp/src/main/resources" excludes="**/.svn/">
<include name="${package-prefix}/apps/svgpp/**/resources/**"/>
</fileset>
</jar>
@@ -1829,10 +1826,9 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/apps/slideshow/**/*.class"/>
</fileset>
- <fileset dir="${resources}">
+ <fileset dir="batik-slideshow/src/main/resources">
<exclude name="**/.svn/" />
<include name="${package-prefix}/apps/slideshow/**/resources/**" />
-
</fileset>
</jar>
</target>
@@ -1850,8 +1846,8 @@ JAVA=/usr/bin/java
<filter token="jarsLibDir" value="${jarsLibDir}" />
<filter token="batikVersion" value="${completeVersion}" />
<filter token="xgcVersion" value="${xgcVersion}" />
- <copy file="${resources}/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.ref"
- tofile="${resources}/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.tmp"
+ <copy file="batik-svgbrowser/src/main/resources/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.ref"
+ tofile="batik-svgbrowser/src/main/resources/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.tmp"
filtering="true" />
<jar flattenAttributes="true"
jarfile="${squiggleJar}">
@@ -1860,6 +1856,7 @@ JAVA=/usr/bin/java
<attribute name="Implementation-Version" value="${completeVersion}"/>
<attribute name="Implementation-Vendor" value="${vendor}"/>
<attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
+ <attribute name="Build-Id" value="${build.id}"/>
<!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
<attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
<attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
@@ -1883,31 +1880,27 @@ JAVA=/usr/bin/java
<attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
<attribute name="Class-Path" value="${jarsLibDir}js.jar" />
<attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
- <attribute name="Build-Id" value="${build.id}"/>
</manifest>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
<fileset dir="${dest}">
<include name="${package-prefix}/apps/svgbrowser/**/*.class"/>
</fileset>
- <fileset dir="${resources}">
+ <fileset dir="batik-svgbrowser/src/main/resources">
<exclude name="**/.svn/" />
<include name="${package-prefix}/apps/svgbrowser/**/resources/Messages.properties" />
<include name="${package-prefix}/apps/svgbrowser/**/resources/**"/>
<exclude name="${package-prefix}/apps/svgbrowser/resources/squiggle.xsl"/>
<exclude name="${package-prefix}/apps/svgbrowser/resources/squiggle.svg"/>
<exclude name="${package-prefix}/apps/svgbrowser/resources/*.policy.tmp"/>
-
</fileset>
<mappedresources>
- <fileset dir="${resources}">
- <!--exclude name="**/.svn/" />
- <include name="${package-prefix}/apps/rasterizer/**/resources/Messages.properties" /-->
+ <fileset dir="batik-svgbrowser/src/main/resources">
<include name="${package-prefix}/apps/svgbrowser/**/resources/*.policy.tmp" />
</fileset>
<globmapper from="*.policy.tmp" to="*.policy" />
</mappedresources>
</jar>
- <delete file="${resources}/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.tmp" />
+ <delete file="batik-svgbrowser/src/main/resources/${package-prefix}/apps/svgbrowser/resources/svgbrowser.policy.tmp" />
</target>
<target name="squiggle-ext-jar" depends="init, squiggle-jar">
@@ -1933,29 +1926,40 @@ JAVA=/usr/bin/java
<attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" />
</manifest>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-extension/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-codec/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-script/src/main/resources" excludes="**/.svn/">
<include name="META-INF/services/**"/>
</fileset>
</jar>
</target>
+
<!-- Squiggle - SVG Browser (dependencies: all) -->
<target name="svg-browser-jar" depends="init, squiggle-jar"/>
<!-- Rasterizer (dependencies: all except GUI util) -->
- <target name="rasterizer-jar">
+ <target name="rasterizer-jar" depends="init, compile, prepare-build">
<antcall target="rasterizer-jar-call">
<param name="jarsLibDir" value="lib/" />
<param name="jarVersion" value="${completeVersion}" />
<param name="rasterizerJar" value="${build}/${project}-rasterizer-${completeVersion}.jar" />
</antcall>
</target>
+
<target name="rasterizer-jar-call" depends="init, compile, prepare-build">
<filter token="jarsLibDir" value="${jarsLibDir}" />
+ <filter token="batikVersion" value="${completeVersion}" />
<filter token="fopVersion" value="${fopVersion}" />
<filter token="xgcVersion" value="${xgcVersion}" />
- <filter token="batikVersion" value="${completeVersion}" />
- <copy file="${resources}/${package-prefix}/apps/rasterizer/resources/rasterizer.policy.ref"
- tofile="${resources}/${package-prefix}/apps/rasterizer/resources/rasterizer.policy.tmp"
+ <copy file="batik-svgrasterizer/src/main/resources/${package-prefix}/apps/rasterizer/resources/rasterizer.policy.ref"
+ tofile="batik-svgrasterizer/src/main/resources//${package-prefix}/apps/rasterizer/resources/rasterizer.policy.tmp"
filtering="true" />
<jar flattenAttributes="true"
jarfile="${rasterizerJar}">
@@ -1992,18 +1996,18 @@ JAVA=/usr/bin/java
<fileset dir="${dest}">
<include name="${package-prefix}/apps/rasterizer/**/*.class"/>
</fileset>
- <fileset dir="${resources}">
+ <fileset dir="batik-svgrasterizer/src/main/resources">
<exclude name="**/.svn/" />
<include name="${package-prefix}/apps/rasterizer/**/resources/Messages.properties" />
</fileset>
<mappedresources>
- <fileset dir="${resources}">
+ <fileset dir="batik-svgrasterizer/src/main/resources">
<include name="${package-prefix}/apps/rasterizer/**/resources/*.policy.tmp" />
</fileset>
<globmapper from="*.policy.tmp" to="*.policy" />
</mappedresources>
</jar>
- <delete file="${resources}/${package-prefix}/apps/rasterizer/resources/rasterizer.policy.tmp" />
+ <delete file="batik-svgrasterizer/src/main/resources/${package-prefix}/apps/rasterizer/resources/rasterizer.policy.tmp" />
</target>
<target name="rasterizer-ext-jar" depends="init, rasterizer-jar">
@@ -2020,21 +2024,31 @@ JAVA=/usr/bin/java
<filter token="batikVersion" value="${completeVersion}" />
<jar flattenAttributes="true"
jarfile="${rasterizer-extJar}">
- <manifest>
- <attribute name="Implementation-Title" value="Batik SVG rasterizer with extensions"/>
- <attribute name="Implementation-Version" value="${completeVersion}"/>
- <attribute name="Implementation-Vendor" value="${vendor}"/>
- <attribute name="Build-Id" value="${build.id}"/>
- <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
- <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" />
- <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" />
- </manifest>
+ <manifest>
+ <attribute name="Implementation-Title" value="Batik SVG rasterizer with extensions"/>
+ <attribute name="Implementation-Version" value="${completeVersion}"/>
+ <attribute name="Implementation-Vendor" value="${vendor}"/>
+ <attribute name="Build-Id" value="${build.id}"/>
+ <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" />
+ </manifest>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-extension/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-codec/src/main/resources" excludes="**/.svn/">
+ <include name="META-INF/services/**"/>
+ </fileset>
+ <fileset dir="batik-script/src/main/resources" excludes="**/.svn/">
<include name="META-INF/services/**"/>
</fileset>
</jar>
</target>
+
<!-- batik-ttf2svg.jar (dependencies: all) -->
<target name="ttf2svg-jar" depends="init, compile, prepare-build">
<antcall target="ttf2svg-jar-call" >
Modified: xmlgraphics/batik/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/pom.xml?rev=1732527&r1=1732526&r2=1732527&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/pom.xml Fri Feb 26 17:21:37 2016
@@ -15,7 +15,6 @@
<properties>
<checkstyle.version>2.15</checkstyle.version>
<compiler.version>3.3</compiler.version>
- <exec.version>1.4.0</exec.version>
<findbugs.version>3.0.1</findbugs.version>
<jar.version>2.6</jar.version>
<java.version>1.6</java.version>