You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2023/08/14 15:28:32 UTC
[xmlgraphics-batik] branch main updated: Move to mvn for dependancies
This is an automated email from the ASF dual-hosted git repository.
ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-batik.git
The following commit(s) were added to refs/heads/main by this push:
new 42f696530 Move to mvn for dependancies
42f696530 is described below
commit 42f696530256dd1bfeec4870922c208d67c0c128
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Mon Aug 14 16:27:49 2023 +0100
Move to mvn for dependancies
---
build.xml | 42 +++++++++++++++++++++++++++++++++++-
lib/fop-transcoder-allinone-2.7.jar | Bin 1725083 -> 0 bytes
lib/rhino-1.7.7.jar | Bin 1255595 -> 0 bytes
lib/xml-apis-1.4.01.jar | Bin 220536 -> 0 bytes
lib/xml-apis-ext-1.3.04.jar | Bin 85686 -> 0 bytes
lib/xmlgraphics-commons-2.7.jar | Bin 675889 -> 0 bytes
6 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index b925297db..8f03617a3 100644
--- a/build.xml
+++ b/build.xml
@@ -129,6 +129,15 @@ To display the available targets type:
<property name="deploy.svn.url" value="https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/batik"/>
<property name="build.site-dir" value="${site}"/>
+ <property name="copy.dependencies.arg" value=""/>
+
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isUnix">
+ <os family="unix" />
+ </condition>
+
<path id="source.files">
<pathelement path="batik-anim/src/main/java"/>
<pathelement path="batik-awt-util/src/main/java"/>
@@ -1124,7 +1133,7 @@ JAVA=/usr/bin/java
<!-- All batik in a single jar (dependencies: none) -->
- <target name="all-jar" depends="init, copy-shared-resources, compile, prepare-build"
+ <target name="all-jar" depends="mvn-jars,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>
@@ -1140,6 +1149,37 @@ JAVA=/usr/bin/java
</fileset>
</jar>
</target>
+
+ <target name="mvn-jars" depends="mvn-jars-unix,mvn-jars-windows" unless="dev">
+ <delete failonerror="false">
+ <fileset dir="${basedir}/lib">
+ <include name="fop-transcoder*.jar"/>
+ <include name="rhino*.jar"/>
+ <include name="xml*.jar"/>
+ </fileset>
+ </delete>
+ <copy todir="${basedir}/lib">
+ <fileset dir="${basedir}/batik-test-old/target/dependency">
+ <include name="fop-transcoder*.jar"/>
+ <include name="rhino*.jar"/>
+ <include name="xml*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="mvn-jars-unix" if="isUnix" unless="dev">
+ <exec executable="mvn" dir="${basedir}" failonerror="true">
+ <arg value="clean"/>
+ <arg line="${copy.dependencies.arg} dependency:copy-dependencies -DskipTests"/>
+ </exec>
+ </target>
+ <target name="mvn-jars-windows" if="isWindows" unless="dev">
+ <exec executable="cmd" dir="${basedir}" failonerror="true">
+ <arg value="/c"/>
+ <arg value="mvn"/>
+ <arg value="clean"/>
+ <arg line="${copy.dependencies.arg} dependency:copy-dependencies -DskipTests"/>
+ </exec>
+ </target>
<!-- Applications ....................................................... -->
<target name="squiggle" depends="init, compile"
diff --git a/lib/fop-transcoder-allinone-2.7.jar b/lib/fop-transcoder-allinone-2.7.jar
deleted file mode 100644
index 2da440e8a..000000000
Binary files a/lib/fop-transcoder-allinone-2.7.jar and /dev/null differ
diff --git a/lib/rhino-1.7.7.jar b/lib/rhino-1.7.7.jar
deleted file mode 100644
index 7aca28390..000000000
Binary files a/lib/rhino-1.7.7.jar and /dev/null differ
diff --git a/lib/xml-apis-1.4.01.jar b/lib/xml-apis-1.4.01.jar
deleted file mode 100644
index 46733464f..000000000
Binary files a/lib/xml-apis-1.4.01.jar and /dev/null differ
diff --git a/lib/xml-apis-ext-1.3.04.jar b/lib/xml-apis-ext-1.3.04.jar
deleted file mode 100644
index a7869d68a..000000000
Binary files a/lib/xml-apis-ext-1.3.04.jar and /dev/null differ
diff --git a/lib/xmlgraphics-commons-2.7.jar b/lib/xmlgraphics-commons-2.7.jar
deleted file mode 100644
index 7396f1307..000000000
Binary files a/lib/xmlgraphics-commons-2.7.jar and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org