BATIK-1275: Refactor shared resources.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/trunk@1869999 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/batik-all/src/tools/resources/assembly/assembly.xml b/batik-all/src/tools/resources/assembly/assembly.xml
index c7aa095..dbda180 100644
--- a/batik-all/src/tools/resources/assembly/assembly.xml
+++ b/batik-all/src/tools/resources/assembly/assembly.xml
@@ -7,16 +7,6 @@
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>../LICENSE</source>
- <outputDirectory>META-INF</outputDirectory>
- </file>
- <file>
- <source>../NOTICE</source>
- <outputDirectory>META-INF</outputDirectory>
- </file>
- </files>
<dependencySets>
<dependencySet>
<unpack>true</unpack>
diff --git a/batik-anim/pom.xml b/batik-anim/pom.xml
index 94e2da6..562100c 100644
--- a/batik-anim/pom.xml
+++ b/batik-anim/pom.xml
@@ -62,6 +62,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>${project.version}</version>
</dependency>
@@ -78,19 +83,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-awt-util/pom.xml b/batik-awt-util/pom.xml
index 3326fb4..a8ddf0e 100644
--- a/batik-awt-util/pom.xml
+++ b/batik-awt-util/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -48,19 +53,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-bridge/pom.xml b/batik-bridge/pom.xml
index ac94d16..668deff 100644
--- a/batik-bridge/pom.xml
+++ b/batik-bridge/pom.xml
@@ -72,6 +72,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>${project.version}</version>
</dependency>
@@ -104,19 +109,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-codec/pom.xml b/batik-codec/pom.xml
index cbfa6e6..a564a42 100644
--- a/batik-codec/pom.xml
+++ b/batik-codec/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-transcoder</artifactId>
<version>${project.version}</version>
</dependency>
@@ -58,19 +63,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-constants/pom.xml b/batik-constants/pom.xml
index 6222d3a..0aaa48e 100644
--- a/batik-constants/pom.xml
+++ b/batik-constants/pom.xml
@@ -34,20 +34,36 @@
<version>1.13.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-css/pom.xml b/batik-css/pom.xml
index 83dbd71..12f4beb 100644
--- a/batik-css/pom.xml
+++ b/batik-css/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -53,19 +58,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-dom/pom.xml b/batik-dom/pom.xml
index aac6352..5c837e0 100644
--- a/batik-dom/pom.xml
+++ b/batik-dom/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -73,19 +78,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-ext/pom.xml b/batik-ext/pom.xml
index 479bd3b..6192982 100644
--- a/batik-ext/pom.xml
+++ b/batik-ext/pom.xml
@@ -34,20 +34,36 @@
<version>1.13.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-extension/pom.xml b/batik-extension/pom.xml
index 03a78f7..0954009 100644
--- a/batik-extension/pom.xml
+++ b/batik-extension/pom.xml
@@ -77,6 +77,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>${project.version}</version>
</dependency>
@@ -93,19 +98,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-gui-util/pom.xml b/batik-gui-util/pom.xml
index f7dfc07..e54a046 100644
--- a/batik-gui-util/pom.xml
+++ b/batik-gui-util/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
@@ -49,19 +54,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-gvt/pom.xml b/batik-gvt/pom.xml
index 91b69da..37fd6c0 100644
--- a/batik-gvt/pom.xml
+++ b/batik-gvt/pom.xml
@@ -42,25 +42,38 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-i18n/pom.xml b/batik-i18n/pom.xml
index 2641d8a..6527e6c 100644
--- a/batik-i18n/pom.xml
+++ b/batik-i18n/pom.xml
@@ -34,20 +34,36 @@
<version>1.13.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-parser/pom.xml b/batik-parser/pom.xml
index 22fb8c3..dfa40dd 100644
--- a/batik-parser/pom.xml
+++ b/batik-parser/pom.xml
@@ -42,6 +42,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -58,19 +63,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-rasterizer-ext/pom.xml b/batik-rasterizer-ext/pom.xml
index 9fb25e0..4093852 100644
--- a/batik-rasterizer-ext/pom.xml
+++ b/batik-rasterizer-ext/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svgrasterizer</artifactId>
<version>${project.version}</version>
</dependency>
@@ -61,20 +66,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-rasterizer/pom.xml b/batik-rasterizer/pom.xml
index f3adeb8..d59dd16 100644
--- a/batik-rasterizer/pom.xml
+++ b/batik-rasterizer/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svgrasterizer</artifactId>
<version>${project.version}</version>
</dependency>
@@ -60,21 +65,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${basedir}/..</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
</build>
</project>
diff --git a/batik-script/pom.xml b/batik-script/pom.xml
index 7c7788f..46f3f11 100644
--- a/batik-script/pom.xml
+++ b/batik-script/pom.xml
@@ -42,6 +42,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -63,27 +68,33 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler.version}</version>
+ <version>${compiler.version}</version><!--$NO-MVN-MAN-VER$-->
<configuration>
<excludes>
<exclude>**/jacl/*</exclude>
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-slideshow/pom.xml b/batik-slideshow/pom.xml
index 1d5c8f5..53aedac 100644
--- a/batik-slideshow/pom.xml
+++ b/batik-slideshow/pom.xml
@@ -46,6 +46,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis-ext</artifactId>
<version>${xmlapisext.version}</version>
@@ -67,20 +72,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-squiggle-ext/pom.xml b/batik-squiggle-ext/pom.xml
index 6e45ae3..3b61061 100644
--- a/batik-squiggle-ext/pom.xml
+++ b/batik-squiggle-ext/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svgbrowser</artifactId>
<version>${project.version}</version>
</dependency>
@@ -61,20 +66,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-squiggle/pom.xml b/batik-squiggle/pom.xml
index d8a66c5..126ac43 100644
--- a/batik-squiggle/pom.xml
+++ b/batik-squiggle/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svgbrowser</artifactId>
<version>${project.version}</version>
</dependency>
@@ -57,20 +62,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-svg-dom/pom.xml b/batik-svg-dom/pom.xml
index 916cee9..8c2f901 100644
--- a/batik-svg-dom/pom.xml
+++ b/batik-svg-dom/pom.xml
@@ -62,6 +62,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -73,19 +78,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-svgbrowser/pom.xml b/batik-svgbrowser/pom.xml
index f04464e..c823007 100644
--- a/batik-svgbrowser/pom.xml
+++ b/batik-svgbrowser/pom.xml
@@ -57,6 +57,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-swing</artifactId>
<version>${project.version}</version>
</dependency>
@@ -83,20 +88,27 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${basedir}/..</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-svggen/pom.xml b/batik-svggen/pom.xml
index 93a14b9..dd2927e 100644
--- a/batik-svggen/pom.xml
+++ b/batik-svggen/pom.xml
@@ -42,25 +42,38 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-svgpp/pom.xml b/batik-svgpp/pom.xml
index 08babe2..13fe0ec 100644
--- a/batik-svgpp/pom.xml
+++ b/batik-svgpp/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-transcoder</artifactId>
<version>${project.version}</version>
</dependency>
@@ -62,20 +67,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-svgrasterizer/pom.xml b/batik-svgrasterizer/pom.xml
index 0d9c24c..b3f19d8 100644
--- a/batik-svgrasterizer/pom.xml
+++ b/batik-svgrasterizer/pom.xml
@@ -42,6 +42,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-transcoder</artifactId>
<version>${project.version}</version>
</dependency>
@@ -58,19 +63,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-swing/pom.xml b/batik-swing/pom.xml
index 254b705..aaf430c 100644
--- a/batik-swing/pom.xml
+++ b/batik-swing/pom.xml
@@ -82,6 +82,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -93,19 +98,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-test-old/pom.xml b/batik-test-old/pom.xml
index 15e8030..296c94c 100644
--- a/batik-test-old/pom.xml
+++ b/batik-test-old/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -110,19 +115,30 @@
<workingDirectory>..</workingDirectory>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
<directory>../test-resources</directory>
</resource>
- <resource>
- <directory>${basedir}/..</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
</resources>
</build>
diff --git a/batik-test-svg/pom.xml b/batik-test-svg/pom.xml
index 56cfd37..8972722 100644
--- a/batik-test-svg/pom.xml
+++ b/batik-test-svg/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-test</artifactId>
<version>${project.version}</version>
</dependency>
@@ -53,19 +58,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-test-swing/pom.xml b/batik-test-swing/pom.xml
index e1baf56..a10f9fe 100644
--- a/batik-test-swing/pom.xml
+++ b/batik-test-swing/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-swing</artifactId>
<version>${project.version}</version>
</dependency>
@@ -48,19 +53,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-test-util/pom.xml b/batik-test-util/pom.xml
index 71e05b0..ed72190 100644
--- a/batik-test-util/pom.xml
+++ b/batik-test-util/pom.xml
@@ -24,9 +24,9 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>batik-test-util</artifactId>
+ <artifactId>batik-shared-resources</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
- <description>Batik Test Harness Utilities</description>
+ <description>Batik shared resources</description>
<parent>
<groupId>org.apache.xmlgraphics</groupId>
@@ -34,27 +34,10 @@
<version>1.13.0-SNAPSHOT</version>
</parent>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>batik-test</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>${basedir}/..</directory>
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
diff --git a/batik-test/pom.xml b/batik-test/pom.xml
index 4f85218..614067c 100644
--- a/batik-test/pom.xml
+++ b/batik-test/pom.xml
@@ -45,6 +45,11 @@
<artifactId>batik-i18n</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -58,20 +63,27 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-transcoder/pom.xml b/batik-transcoder/pom.xml
index 0057933..640839c 100644
--- a/batik-transcoder/pom.xml
+++ b/batik-transcoder/pom.xml
@@ -61,6 +61,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svggen</artifactId>
<version>${project.version}</version>
@@ -83,19 +88,27 @@
</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/batik-ttf2svg/pom.xml b/batik-ttf2svg/pom.xml
index 064ead5..8c4313a 100644
--- a/batik-ttf2svg/pom.xml
+++ b/batik-ttf2svg/pom.xml
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-svggen</artifactId>
<version>${project.version}</version>
</dependency>
@@ -57,20 +62,26 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-util/pom.xml b/batik-util/pom.xml
index 5904f26..8640426 100644
--- a/batik-util/pom.xml
+++ b/batik-util/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -84,20 +89,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
diff --git a/batik-xml/pom.xml b/batik-xml/pom.xml
index 091993d..37fdba7 100644
--- a/batik-xml/pom.xml
+++ b/batik-xml/pom.xml
@@ -37,25 +37,38 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>batik-shared-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>batik-util</artifactId>
<version>${project.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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>unpack-shared-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>${project.groupId}</includeGroupIds>
+ <includeArtifactIds>batik-shared-resources</includeArtifactIds>
+ <includes>**/LICENSE,**/NOTICE</includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/build.xml b/build.xml
index a73a24a..bf8aee7 100644
--- a/build.xml
+++ b/build.xml
@@ -72,8 +72,9 @@
<project default="help" name="batik" basedir=".">
<!-- Configuring the build -->
- <property file="${basedir}/build-local.properties"/>
<property environment="env"/>
+ <property file="${basedir}/build-local.properties"/>
+ <property file="${basedir}/build.properties"/>
<!-- Initializations .................................................... -->
<target name="init">
@@ -90,14 +91,11 @@
<property name="xgcVersion" value="2.4.0-SNAPSHOT" />
<property name="fopVersion" value="2.4.0-SNAPSHOT" />
<property name="vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)" />
-
- <property file="build.properties"/>
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="on"/>
<property name="javac.source" value="1.7"/>
<property name="javac.target" value="1.7"/>
-
<property name="src" value="sources"/>
<property name="src-internal-codec" value="sources-internal-codec"/>
<property name="resources" value="resources"/>
@@ -391,7 +389,21 @@
<delete dir="${build}/docs/javadoc"/>
</target>
- <target name="bin-zip" depends="init, jars, bundle-script">
+ <target name="copy-shared-resources">
+ <copy todir="${basedir}">
+ <fileset dir="${basedir}/batik-shared-resources/src/main/resources">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="clean-shared-resources">
+ <delete file="${basedir}/LICENSE" failonerror="false"/>
+ <delete file="${basedir}/NOTICE" failonerror="false"/>
+ </target>
+
+ <target name="bin-zip" depends="init, copy-shared-resources, jars, bundle-script">
<zip zipfile="${project}-bin-${completeVersion}.zip">
<zipfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
@@ -422,7 +434,7 @@
</zip>
</target>
- <target name="src-zip" depends="init, record-svn-revision">
+ <target name="src-zip" depends="init, copy-shared-resources, record-svn-revision">
<zip zipfile="${project}-src-${completeVersion}.zip">
<zipfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
@@ -460,7 +472,7 @@
<delete dir="${build}/docs/javadoc"/>
</target>
- <target name="bin-tgz" depends="init, jars, bundle-script">
+ <target name="bin-tgz" depends="init, copy-shared-resources, jars, bundle-script">
<tar tarfile="${project}-bin-${completeVersion}.tar.gz" compression="gzip">
<tarfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
@@ -491,7 +503,7 @@
</tar>
</target>
- <target name="src-tgz" depends="init, record-svn-revision">
+ <target name="src-tgz" depends="init, copy-shared-resources, record-svn-revision">
<tar tarfile="${project}-src-${completeVersion}.tar.gz" compression="gzip">
<tarfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
@@ -584,7 +596,7 @@
</exec>
</target>
- <target name="src-jar" depends="init, record-svn-revision">
+ <target name="src-jar" depends="init, copy-shared-resources, record-svn-revision">
<jar jarfile="${build}/lib/${project}-src-${completeVersion}.jar">
<fileset dir=".">
<include name="LICENSE"/>
@@ -706,7 +718,6 @@
<src path="batik-test/src/main/java"/>
<src path="batik-test-svg/src/main/java"/>
<src path="batik-test-swing/src/main/java"/>
- <!-- <src path="batik-test-util/src/main/java"/> -->
<src path="batik-util/src/test/java"/>
<exclude name="org/apache/batik/util/*TestCases.java"/>
<exclude name="org/apache/batik/util/*TestSuite.java"/>
@@ -811,7 +822,6 @@
</jar>
</target>
-
<target name="record-svn-revision" depends="determine-svn-revision"
if="svn-revision-determined">
<echo message="${svn-revision-number}" file="svn-revision"/>
@@ -1114,7 +1124,7 @@
<!-- All batik in a single jar (dependencies: none) -->
- <target name="all-jar" depends="init, compile, prepare-build"
+ <target name="all-jar" depends="init, copy-shared-resources, compile, prepare-build"
description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
<jar jarfile="${build}/lib/${project}-all-${completeVersion}.jar">
<manifest>
@@ -1550,7 +1560,7 @@
<!-- Cleans everything .................................................. -->
<target name="clean"
- depends="init, clean-compile, clean-docs, clean-test"
+ depends="init, clean-compile, clean-docs, clean-test, clean-shared-resources"
description="Cleans everything">
<delete dir="${build}"/>
<delete file="${project}-bin-${completeVersion}.zip"/>
diff --git a/pom.xml b/pom.xml
index 5c70340..b42c84a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
<properties>
<checkstyle.version>2.15</checkstyle.version>
<compiler.version>3.3</compiler.version>
+ <dependency.version>3.1.1</dependency.version>
<findbugs.version>3.0.1</findbugs.version>
<jar.version>3.1.1</jar.version>
<java.version>1.7</java.version>
@@ -85,6 +86,7 @@
<module>batik-rasterizer-ext</module>
<module>batik-rasterizer</module>
<module>batik-script</module>
+ <module>batik-shared-resources</module>
<module>batik-slideshow</module>
<module>batik-squiggle-ext</module>
<module>batik-squiggle</module>
@@ -99,13 +101,9 @@
<module>batik-util</module>
<module>batik-ttf2svg</module>
<module>batik-xml</module>
-
<module>batik-test-old</module>
<module>batik-test-svg</module>
<module>batik-test-swing</module>
-<!--
- <module>batik-test-util</module>
--->
</modules>
<build>
@@ -120,12 +118,7 @@
<target>${java.version}</target>
<executable>${jdk.path}/bin/javac</executable>
<fork>true</fork>
- <compilerArgs>
- <!-- [TBD] fix deprecation and unchecked warnings
- <arg>-Xlint:deprecation</arg>
- <arg>-Xlint:unchecked</arg>
- -->
- </compilerArgs>
+ <compilerArgs></compilerArgs>
<showWarnings>false</showWarnings>
</configuration>
</plugin>
diff --git a/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java b/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java
index 72ab498..1467674 100644
--- a/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java
+++ b/samples/tests/resources/java/sources/com/untrusted/script/UntrustedScriptHandler.java
@@ -34,13 +34,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Window;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.ScriptHandler;
+import org.apache.batik.w3c.dom.Window;
/**
* This class implements the ScriptHandler interface and represents an
