You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/05/23 17:45:58 UTC

[GitHub] emilianbold closed pull request #548: [NETBEANS-781] Adds Maven coordinates for Ant libs

emilianbold closed pull request #548: [NETBEANS-781] Adds Maven coordinates for Ant libs
URL: https://github.com/apache/incubator-netbeans/pull/548
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/o.apache.tools.ant.module/external/ant-1.10.1-license.txt b/o.apache.tools.ant.module/external/ant-1.10.1-license.txt
index d138a6d99..c80e86774 100644
--- a/o.apache.tools.ant.module/external/ant-1.10.1-license.txt
+++ b/o.apache.tools.ant.module/external/ant-1.10.1-license.txt
@@ -1,7 +1,7 @@
 Name: Apache Ant
 Origin: Apache Software Foundation
 Version: 1.10.1
-Files: ant-libs-1.10.1.zip ant-misc-1.10.1.zip
+Files: ant-misc-1.10.1.zip ant-1.10.1.jar ant-antlr-1.10.1.jar ant-apache-bcel-1.10.1.jar ant-apache-bsf-1.10.1.jar ant-apache-log4j-1.10.1.jar ant-apache-oro-1.10.1.jar ant-apache-regexp-1.10.1.jar ant-apache-resolver-1.10.1.jar ant-apache-xalan2-1.10.1.jar ant-commons-logging-1.10.1.jar ant-commons-net-1.10.1.jar ant-jai-1.10.1.jar ant-javamail-1.10.1.jar ant-jdepend-1.10.1.jar ant-jmf-1.10.1.jar ant-jsch-1.10.1.jar ant-junit-1.10.1.jar ant-junit4-1.10.1.jar ant-launcher-1.10.1.jar ant-netrexx-1.10.1.jar ant-swing-1.10.1.jar ant-testutil-1.10.1.jar ant-xz-1.10.1.jar
 Description: Ant build tool.
 License: Apache-2.0
 URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
diff --git a/o.apache.tools.ant.module/external/binaries-list b/o.apache.tools.ant.module/external/binaries-list
index dd376e2da..1316eb2a5 100644
--- a/o.apache.tools.ant.module/external/binaries-list
+++ b/o.apache.tools.ant.module/external/binaries-list
@@ -14,5 +14,27 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-0B539A378C2EA52B17BD0326ECE03DF66E3A65E9 ant-libs-1.10.1.zip
 F6E0317E5F315E395DA47E5B008D01FAA48C91FB ant-misc-1.10.1.zip
+591B690CC83D444FA9C9813A792AEABA412E4AB6 org.apache.ant:ant:1.10.1
+6B28EDC177AFA72385D5F0CBAE44C6636EB65391 org.apache.ant:ant-antlr:1.10.1
+D159F15690BDC183ED9C9E0A360D30066C99F5F8 org.apache.ant:ant-apache-bcel:1.10.1
+7B53CAFB6EC691BC254ED0EBFE2189F56AB6E743 org.apache.ant:ant-apache-bsf:1.10.1
+4801359BCB43AC83D97BDE66AA8709EB06D36DFD org.apache.ant:ant-apache-log4j:1.10.1
+1C99B19E9DCF658E8FE8CDFAD6FE19F947E2AB72 org.apache.ant:ant-apache-oro:1.10.1
+8A637D45F20022A3173CC2BB25E972C1F60689DE org.apache.ant:ant-apache-regexp:1.10.1
+F5D0CD549BE8C899271C8CD74CA8F49F0AF39F45 org.apache.ant:ant-apache-resolver:1.10.1
+60B9BD203EAFAF970AFD302A11E8E860BC8B6A1F org.apache.ant:ant-apache-xalan2:1.10.1
+4C80B49B37E529B42471B4C8678B75A9C8EE021F org.apache.ant:ant-commons-logging:1.10.1
+DC91B346980D95262404DFD94FF692C1FA679360 org.apache.ant:ant-commons-net:1.10.1
+6C6901F57846F5C81C6552C06B45C2FA1C227E1E org.apache.ant:ant-jai:1.10.1
+1C33B613FD39A83A9BAC528EF90ADE7BAFB57F22 org.apache.ant:ant-javamail:1.10.1
+C4BCDEA89AE30C14F041CB09A8D2DC7AFA9D1CE5 org.apache.ant:ant-jdepend:1.10.1
+18D834F1847F0C049C54A0F9D41EA719696014AF org.apache.ant:ant-jmf:1.10.1
+67AA76F9DFD6D9ED640D28CD6E5B9D95FA31F889 org.apache.ant:ant-jsch:1.10.1
+57B1C4A50A9095E95B3CE2EF8CCDCEB945F7BB20 org.apache.ant:ant-junit:1.10.1
+C779AB1BDCF968D85571BA96FD9B85AD8644CCB7 org.apache.ant:ant-junit4:1.10.1
+7811CCC3F0D8612E402F47581915C34B2BFA8C76 org.apache.ant:ant-launcher:1.10.1
+C0339FD6A3EB0508C9E1E8B9C522AF7FE9AD0E1C org.apache.ant:ant-netrexx:1.10.1
+D5B5AF0B0CC8BFCEBB8A9968DCC04EB74EA6BCBB org.apache.ant:ant-swing:1.10.1
+31F0CB1BBDC9B01A32BA9B886C42BDBA24ADDC25 org.apache.ant:ant-testutil:1.10.1
+9395ED0CE8DBA4352227E51869CBC297ED9D2DDC org.apache.ant:ant-xz:1.10.1
diff --git a/o.apache.tools.ant.module/external/build.xml b/o.apache.tools.ant.module/external/build.xml
index b874a26b2..f2e3ad4c1 100644
--- a/o.apache.tools.ant.module/external/build.xml
+++ b/o.apache.tools.ant.module/external/build.xml
@@ -21,7 +21,35 @@
 -->
 <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
     <target name="unzip">
-        <unzip src="ant-libs-1.10.1.zip" dest="lib"/>
+        <mkdir dir="lib"/>
+        <copy todir="lib">
+            <fileset dir=".">
+                <include name="ant-antlr-1.10.1.jar" />
+                <include name="ant-apache-bcel-1.10.1.jar" />
+                <include name="ant-apache-bsf-1.10.1.jar" />
+                <include name="ant-apache-log4j-1.10.1.jar" />
+                <include name="ant-apache-oro-1.10.1.jar" />
+                <include name="ant-apache-regexp-1.10.1.jar" />
+                <include name="ant-apache-resolver-1.10.1.jar" />
+                <include name="ant-apache-xalan2-1.10.1.jar" />
+                <include name="ant-commons-logging-1.10.1.jar" />
+                <include name="ant-commons-net-1.10.1.jar" />
+                <include name="ant-jai-1.10.1.jar" />
+                <include name="ant-javamail-1.10.1.jar" />
+                <include name="ant-jdepend-1.10.1.jar" />
+                <include name="ant-jmf-1.10.1.jar" />
+                <include name="ant-jsch-1.10.1.jar" />
+                <include name="ant-junit-1.10.1.jar" />
+                <include name="ant-junit4-1.10.1.jar" />
+                <include name="ant-launcher-1.10.1.jar" />
+                <include name="ant-netrexx-1.10.1.jar" />
+                <include name="ant-swing-1.10.1.jar" />
+                <include name="ant-testutil-1.10.1.jar" />
+                <include name="ant-xz-1.10.1.jar" />
+                <include name="ant-1.10.1.jar" />
+            </fileset>
+            <globmapper from="*-1.10.1.jar" to="*.jar"/>
+        </copy>
     </target>
     <target name="clean">
         <delete dir="lib"/>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists