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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-16 23:07:36 +0000 (Tue, 16 Dec 2008)
New Revision: 7687

Modified:
   trunk/maven-debian-helper/cdbs/maven-vars.mk
   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/src/main/java/org/debian/maven/plugin/InstallMojo.java
Log:
switch to lifecycle package for building


Modified: trunk/maven-debian-helper/cdbs/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/cdbs/maven-vars.mk	2008-12-16 22:46:34 UTC (rev 7686)
+++ trunk/maven-debian-helper/cdbs/maven-vars.mk	2008-12-16 23:07:36 UTC (rev 7687)
@@ -66,7 +66,7 @@
 # You can specify additional JVM arguments in MAVEN_OPTS and Maven
 # command-line arguments in MAVEN_ARGS. You can additionally define
 # MAVEN_ARGS_<package> for each individual package.
-DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
 		 $(JAVA_OPTS) -Dclassworlds.conf=/etc/maven2/m2-debian.conf \
 		 org.codehaus.classworlds.Launcher $(DEB_MAVEN_ARGS) \
 		 -s/etc/maven2/settings-debian.xml \
@@ -80,7 +80,7 @@
 # Building uses the default target from build.xml, installing and testing is
 # only called if the corresponding variable is set. You can also specify
 # multiple targets for each step.
-DEB_MAVEN_BUILD_TARGET = compile jar:jar   # TODO: should be 'package'
+DEB_MAVEN_BUILD_TARGET = package
 DEB_MAVEN_INSTALL_TARGET = debian:install
 DEB_MAVEN_CHECK_TARGET =
 DEB_MAVEN_CLEAN_TARGET = clean

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	2008-12-16 22:46:34 UTC (rev 7686)
+++ trunk/maven-debian-helper/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-12-16 23:07:36 UTC (rev 7687)
@@ -78,6 +78,12 @@
     <org.apache.maven.plugins.maven-resources-plugin.version>
       2.2
     </org.apache.maven.plugins.maven-resources-plugin.version>
+    <org.apache.maven.plugins.maven-site-plugin.version>
+      2.0-beta-7
+    </org.apache.maven.plugins.maven-site-plugin.version>
+    <org.apache.maven.plugins.maven-surefire-plugin.version>
+      2.4.3
+    </org.apache.maven.plugins.maven-surefire-plugin.version>
   </properties>
 
   <build>
@@ -171,7 +177,7 @@
          </plugin>
          <plugin>
            <artifactId>maven-site-plugin</artifactId>
-           <version>2.0-beta-6</version>
+           <version>${org.apache.maven.plugins.maven-site-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-source-plugin</artifactId>
@@ -179,7 +185,7 @@
          </plugin>         
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.4.2</version>
+            <version>${org.apache.maven.plugins.maven-surefire-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-war-plugin</artifactId>

Modified: trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java	2008-12-16 22:46:34 UTC (rev 7686)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallMojo.java	2008-12-16 23:07:36 UTC (rev 7687)
@@ -48,11 +48,11 @@
   /**
    * directory where the current pom.xml can be found
    *
-   * @parameter expression="${project.build.directory}/.."
+   * @parameter expression="${project.build.directory}"
    * @required
    * @readonly
    */
-  private String pomDir;
+  private String buildDir;
 
   /**
    * directory of the jar file
@@ -130,9 +130,14 @@
     return artifactId + "-" + version + ".pom";
   }
 
+  private String pomDir()
+  {
+    return buildDir.replaceFirst("[^/]*$", "");
+  }
+
   private String pomSrcPath()
   {
-    return pomDir + "/pom.xml";
+    return pomDir() + "/pom.xml";
   }
 
   private String pomDestPath()