From: Dominik Stadler <centic@apache.org>
Date: Tue, 30 Nov 2021 06:19:59 +0000 (+0000)
Subject: Remove some ant-targets related to installation/osgi which do not work any more anyway
X-Git-Tag: REL_5_2_0~155
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e4cd8ce8c07f31eed25c6dc95333f4e63dd20a1;p=poi.git

Remove some ant-targets related to installation/osgi which do not work any more anyway

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895417 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index 337469e8d6..de89217ecc 100644
--- a/build.xml
+++ b/build.xml
@@ -2438,7 +2438,7 @@ under the License.
         <echo>Use "ant dist-checksum" to create sha256/sha512 checksums and GPG signatures</echo>
     </target>
 
-    <target name="osgi" depends="mvn-install">
+    <target name="osgi">
        <echo message="Building OSGi bundle via Maven" />
        <mvn:mvn pom="osgi/pom.xml">
           <arg value="-Dpoi.version=${version.id}" />
@@ -2452,7 +2452,7 @@ under the License.
 
     <!-- continuous integration targets -->
     <target name="jenkins"
-        depends="replaceVersion, compile, test-all, jar, javadocs, assemble, findbugs, release-notes, rat-check, forbidden-apis-check, help, fetch-svn-jars, maven-poms, maventask, mvn-install"
+        depends="replaceVersion, compile, test-all, jar, javadocs, assemble, findbugs, release-notes, rat-check, forbidden-apis-check, help, fetch-svn-jars, maven-poms, maventask"
         description="Target run by Jenkins on a continuous basis. Builds and tests POI, generates artifacts and documentation, and searches for problems."/>
 
     <target name="maventask" depends="init">
@@ -2467,27 +2467,6 @@ under the License.
         </taskdef>
     </target>
 
-    <macrodef name="m2-install">
-        <attribute name="artifactId"/>
-        <attribute name="versionId" default="${version.id}"/>
-
-        <sequential>
-            <mvn:install file="${dist.dir}/maven/@{artifactId}/@{artifactId}-@{versionId}.jar">
-                <pom file="${dist.dir}/maven/@{artifactId}/@{artifactId}-@{versionId}.pom"/>
-            </mvn:install>
-        </sequential>
-    </macrodef>
-
-    <target name="mvn-install" depends="maventask,jar,maven-poms" description="Install POI artifacts into the local repository. Equivalent of 'mvn install'">
-        <m2-install artifactId="poi"/>
-        <m2-install artifactId="poi-scratchpad"/>
-        <m2-install artifactId="poi-ooxml"/>
-        <m2-install artifactId="poi-examples"/>
-        <m2-install artifactId="poi-ooxml-lite"/>
-        <m2-install artifactId="poi-ooxml-full"/>
-        <m2-install artifactId="poi-excelant"/>
-    </target>
-
     <target name="rat-check" depends="init" description="Runs the Apache Creadur Rat check against the source code, to spot any files which are missing the correct license headers">
         <mkdir dir="${rat.reportdir}" />