[pkg-java] r7778 - in trunk/maven-debian-helper: . debian maven-debian-helper maven-debian-helper/src/main/resources/org/apache/maven/project maven-debian-plugin

twerner at alioth.debian.org twerner at alioth.debian.org
Mon Jan 5 21:49:06 UTC 2009 

Author: twerner
Date: 2009-01-05 21:49:06 +0000 (Mon, 05 Jan 2009)
New Revision: 7778

Added:
   trunk/maven-debian-helper/ganneff.sh
Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/debian/control
   trunk/maven-debian-helper/debian/copyright
   trunk/maven-debian-helper/debian/rules
   trunk/maven-debian-helper/maven-debian-helper/pom.xml
   trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
   trunk/maven-debian-helper/maven-debian-plugin/pom.xml
   trunk/maven-debian-helper/pom.xml
Log:
* bootstrap package without build depending on itself
* minor fixes


Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/debian/changelog	2009-01-05 21:49:06 UTC (rev 7778)
@@ -1,6 +1,5 @@
 maven-debian-helper (0.1) unstable; urgency=low
 
-  UNRELEASED
   * Initial release. (Closes: #508511)
 
  -- Torsten Werner <twerner at debian.org>  Mon, 05 Jan 2009 11:47:25 +0100

Modified: trunk/maven-debian-helper/debian/control
===================================================================
--- trunk/maven-debian-helper/debian/control	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/debian/control	2009-01-05 21:49:06 UTC (rev 7778)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), openjdk-6-jdk, maven-debian-helper
+Build-Depends: cdbs, debhelper (>= 5), openjdk-6-jdk, libmaven-clean-plugin-java,
+ libmaven-resources-plugin-java, libmaven-compiler-plugin-java,
+ libmaven-jar-plugin-java, libmaven-site-plugin-java, libsurefire-java
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/

Modified: trunk/maven-debian-helper/debian/copyright
===================================================================
--- trunk/maven-debian-helper/debian/copyright	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/debian/copyright	2009-01-05 21:49:06 UTC (rev 7778)
@@ -27,6 +27,10 @@
 
 License: Apache-2.0 (see above)
 
+The file is a slightly modified version of Maven's super POM. It
+mentions a file called NOTICE which contains the thirdparty copyright
+information for Maven's binary distribution.
+
 ----------
 
 Files: maven-repo/org/codehaus/*
@@ -54,10 +58,9 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 The full text of the license can be found in
 `/usr/share/common-licenses/GPL-2'.

Modified: trunk/maven-debian-helper/debian/rules
===================================================================
--- trunk/maven-debian-helper/debian/rules	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/debian/rules	2009-01-05 21:49:06 UTC (rev 7778)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+install/maven-debian-helper::
+	sh ganneff.sh

Added: trunk/maven-debian-helper/ganneff.sh
===================================================================
--- trunk/maven-debian-helper/ganneff.sh	                        (rev 0)
+++ trunk/maven-debian-helper/ganneff.sh	2009-01-05 21:49:06 UTC (rev 7778)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# This horror script is used to bootstrap maven-debian-helper.
+
+set -e
+
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+REPO=/usr/share/maven-repo
+ODM=$REPO/org/debian/maven
+VERSION=$(dpkg-parsechangelog | sed -ne 's/Version: //p')
+DESTDIR=debian/maven-debian-helper
+
+boot() {
+  PKG=org/apache/maven/project
+  POM=$PKG/pom-4.0.0.xml
+  DIR=maven-debian-helper/src/main/resources
+  mkdir -p org/apache/maven/project/
+  sed '/startworkaround/,/endworkaround/d' $DIR/$POM > $POM
+  jar cf boot.jar org
+  rm -rf org
+  sed -e's,/.*/maven-debian-helper.jar,boot.jar,' \
+      -e's,org.debian.maven.Wrapper,org.apache.maven.cli.MavenCli,' \
+      etc/m2-debian.conf > boot.conf
+}
+
+scan() {
+  P_ARCHIVER=$(ls $REPO/org/codehaus/plexus/plexus-archiver/)
+  P_INTERPOLATION=$(ls $REPO/org/codehaus/plexus/plexus-interpolation/)
+  M_RESOURCES_P=$(ls $REPO/org/apache/maven/plugins/maven-resources-plugin/)
+  M_PLUGIN_P=$(ls $REPO/org/apache/maven/plugins/maven-plugin-plugin/)
+}
+
+maven() {
+  $JAVA_HOME/bin/java -cp /usr/share/maven2/boot/classworlds.jar \
+    -D"classworlds.conf=boot.conf" org.codehaus.classworlds.Launcher \
+    -s"etc/settings-debian.xml" package \
+    -D"org.codehaus.plexus.plexus-archiver.version=$P_ARCHIVER" \
+    -D"org.codehaus.plexus.plexus-interpolation.version=$P_INTERPOLATION" \
+    -D"org.apache.maven.plugins.maven-resources-plugin.version=$M_RESOURCES_P" \
+    -D"org.apache.maven.plugins.maven-plugin-plugin.version=$M_PLUGIN_P" \
+    "$@"
+}
+
+debian_install() {
+  # parent pom
+  install -D -m644 pom.xml \
+    $DESTDIR/$ODM/maven-debian/$VERSION/maven-debian-$VERSION.pom
+  # maven-debian-helper
+  dh_install -pmaven-debian-helper maven-debian-helper/target/*.jar \
+    $ODM/maven-debian-helper/$VERSION/
+  dh_link -pmaven-debian-helper \
+    $ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.jar \
+    /usr/share/java/maven-debian-helper.jar
+  install -D -m644 maven-debian-helper/pom.xml \
+    $DESTDIR/$ODM/maven-debian-helper/$VERSION/maven-debian-helper-$VERSION.pom
+  # maven-debian-plugin
+  dh_install -pmaven-debian-helper maven-debian-plugin/target/*.jar \
+    $ODM/maven-debian-plugin/$VERSION/
+  dh_link -pmaven-debian-helper \
+    $ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.jar \
+    /usr/share/java/maven-debian-plugin.jar
+  install -D -m644 maven-debian-plugin/pom.xml \
+    $DESTDIR/$ODM/maven-debian-plugin/$VERSION/maven-debian-plugin-$VERSION.pom
+}
+
+cleanup() {
+  maven clean
+  rm -f boot.jar boot.conf
+}
+
+boot
+scan
+maven package
+debian_install
+cleanup
+

Modified: trunk/maven-debian-helper/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/pom.xml	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/maven-debian-helper/pom.xml	2009-01-05 21:49:06 UTC (rev 7778)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.debian.maven</groupId>
     <artifactId>maven-debian</artifactId>
-    <version>0.2</version>
+    <version>0.1</version>
   </parent>
 
   <artifactId>maven-debian-helper</artifactId>

Modified: trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2009-01-05 21:49:06 UTC (rev 7778)
@@ -97,6 +97,7 @@
 
   <build>
     <!-- load the correct version of maven-debian-plugin -->
+    <!-- startworkaround -->
     <plugins>
       <plugin>
 	<groupId>org.debian.maven</groupId>
@@ -104,6 +105,7 @@
 	<version>${org.debian.maven.maven-debian-plugin.version}</version>
       </plugin>
     </plugins>
+    <!-- endworkaround -->
 
     <directory>target</directory>
     <outputDirectory>target/classes</outputDirectory>

Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml	2009-01-05 21:49:06 UTC (rev 7778)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>maven-debian</artifactId>
     <groupId>org.debian.maven</groupId>
-    <version>0.2</version>
+    <version>0.1</version>
   </parent>
   
   <artifactId>maven-debian-plugin</artifactId>

Modified: trunk/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/pom.xml	2009-01-05 10:48:32 UTC (rev 7777)
+++ trunk/maven-debian-helper/pom.xml	2009-01-05 21:49:06 UTC (rev 7778)
@@ -4,7 +4,7 @@
 
   <groupId>org.debian.maven</groupId>
   <artifactId>maven-debian</artifactId>
-  <version>0.2</version>
+  <version>0.1</version>
   <packaging>pom</packaging>
   <name>helper tools for using Maven to build Debian packages</name>

More information about the pkg-java-commits mailing list