Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/istack-commons-buildtools/files: istack-commons-20090620-less-maven.patch
Date: Sun, 21 Jun 2009 05:21:28
Message-Id: E1MIFUc-0006Ey-Oq@stork.gentoo.org
1 robbat2 09/06/21 05:21:26
2
3 Added: istack-commons-20090620-less-maven.patch
4 Log:
5 Part of new istack-commons (upstream pom.xml tag is 1.1-SNAPSHOT) in a new slot, needed for jersey. buildtools portion was not packaged before.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch?rev=1.1&content-type=text/plain
13
14 Index: istack-commons-20090620-less-maven.patch
15 ===================================================================
16 The shipped build.xml is completely bogus in trying to bring in maven.
17 We just bring in ant-core, codemodel and istack-commons-runtime-1.1 ourselves,
18 and it compiles perfectly.
19
20 Signed-off-by: Robin H. Johnson <robbat2@g.o>
21
22 diff -Nuar istack-commons-20090620.orig/buildtools/build.xml istack-commons-20090620/buildtools/build.xml
23 --- istack-commons-20090620.orig/buildtools/build.xml 2009-03-30 19:28:53.000000000 -0700
24 +++ istack-commons-20090620/buildtools/build.xml 2009-06-20 22:15:09.194598087 -0700
25 @@ -1,6 +1,8 @@
26 <?xml version="1.0"?>
27 <project name="istack-commons-buildtools" basedir="." default="dist" xmlns:artifact="urn:maven-artifact-ant">
28 + <property name="name" value="istack-commons-buildtools" />
29 <import file="../build-common.xml"/>
30 + <!--
31 <property name="maven.ant.file" value="maven-ant-tasks-2.0.9.jar"/>
32 <property name="src" value="src"/>
33 <property name="lib.dir" value="lib"/>
34 @@ -79,5 +81,6 @@
35 <fileset dir="${src}"/>
36 </jar>
37 </target>
38 + -->
39
40 </project>