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

twerner at alioth.debian.org twerner at alioth.debian.org
Fri Dec 12 10:08:10 UTC 2008 

Author: twerner
Date: 2008-12-12 10:08:09 +0000 (Fri, 12 Dec 2008)
New Revision: 7652

Removed:
   trunk/maven-debian-helper/examples/
Modified:
   trunk/maven-debian-helper/cdbs/maven-vars.mk
   trunk/maven-debian-helper/cdbs/maven.mk
   trunk/maven-debian-helper/debian/copyright
   trunk/maven-debian-helper/pom.xml
   trunk/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java
   trunk/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Log:
minor fixes and cleanups


Modified: trunk/maven-debian-helper/cdbs/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/cdbs/maven-vars.mk	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/cdbs/maven-vars.mk	2008-12-12 10:08:09 UTC (rev 7652)
@@ -55,7 +55,6 @@
 		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 
 # Extra arguments for the Maven command line.
-# TODO: DOES NOT WORK YET BECAUSE IT NEEDS PATCHING MAVEN!!!
 DEB_MAVEN_ARGS = 
 
 # Property file for Maven, defaults to debian/maven.properties if it exists.
@@ -68,15 +67,11 @@
 # 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) \
-		 $(MAVEN_EXTRA_OPTS) -Dclassworlds.conf=/etc/maven2/m2-debian.conf \
-		 -Dmaven.home=$(MAVEN_HOME) $(DEB_MAVEN_EXTRAPROPS) \
+		 $(JAVA_OPTS) -Dclassworlds.conf=/etc/maven2/m2-debian.conf \
 		 org.codehaus.classworlds.Launcher $(DEB_MAVEN_ARGS) \
 		 -s/etc/maven2/settings-debian.xml \
 		 $(if $(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS_$(cdbs_curpkg)),$(MAVEN_ARGS))
 
-# TODO: DOES NOT WORK YET
-#		 $(if $(DEB_MAVEN_PROPERTYFILE),-propertyfile $(DEB_MAVEN_PROPERTYFILE),)
-
 # Targets to invoke for building, installing, testing and cleaning up.
 # Building uses the default target from build.xml, installing and testing is
 # only called if the corresponding variable is set. You can also specify

Modified: trunk/maven-debian-helper/cdbs/maven.mk
===================================================================
--- trunk/maven-debian-helper/cdbs/maven.mk	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/cdbs/maven.mk	2008-12-12 10:08:09 UTC (rev 7652)
@@ -31,7 +31,7 @@
 
 DEB_MAVEN_REPO := /usr/share/maven-repo
 
-MAVEN_EXTRA_OPTS = \
+JAVA_OPTS = \
   $(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE)) \
   -Dproperties.file.auto=$(CURDIR)/debian/auto.properties
 

Modified: trunk/maven-debian-helper/debian/copyright
===================================================================
--- trunk/maven-debian-helper/debian/copyright	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/debian/copyright	2008-12-12 10:08:09 UTC (rev 7652)
@@ -18,3 +18,12 @@
 
 The full text of the license can be found in
 '/usr/share/common-licenses/Apache-2.0'.
+
+----------
+
+File: src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+
+Copyright: 2001-2007 Apache Software Foundation.
+
+License: Apache-2.0 (see above)
+

Modified: trunk/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/pom.xml	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/pom.xml	2008-12-12 10:08:09 UTC (rev 7652)
@@ -22,5 +22,4 @@
       <systemPath>/usr/share/java/maven2.jar</systemPath>
     </dependency>
   </dependencies>
-
 </project>

Modified: trunk/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java
===================================================================
--- trunk/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/src/main/java/org/debian/maven/Wrapper.java	2008-12-12 10:08:09 UTC (rev 7652)
@@ -7,10 +7,14 @@
 import org.apache.maven.cli.MavenCli;
 import org.codehaus.classworlds.ClassWorld;
 
+/* This is a wrapper for Maven's main function that implements reading 2
+ * property files: debian/auto.properties and debian/manual.properties.
+ */
+
 public class Wrapper
 {
-  /* Opens the filename specified by property 'key' and adds its content to
-   * args as -Dkey=value.
+  /* Opens the filename specified by property 'key' and returns its content as
+   * a String array of items -Dkey=value.
    */
   public static String[] getProperties(String key) throws IOException
   {
@@ -35,7 +39,7 @@
   }
 
   /* Add more properties to the commandline. The files specified
-   * by 'properties.file.auto' and 'properties.file.manual' are read.
+   * by '-Dproperties.file.auto=' and '-Dproperties.file.manual=' are read.
    */
   public static String[] updateCommandLine(String[] args) throws IOException
   {

Modified: trunk/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
===================================================================
--- trunk/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-12-12 09:43:17 UTC (rev 7651)
+++ trunk/maven-debian-helper/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-12-12 10:08:09 UTC (rev 7652)
@@ -50,6 +50,19 @@
   </pluginRepositories>
 
   <properties>
+    <!-- TODO: add properties for ALL core plugins -->
+    <org.apache.maven.plugins.maven-clean-plugin.version>
+      2.2
+    </org.apache.maven.plugins.maven-clean-plugin.version>
+    <org.apache.maven.plugins.maven-compiler-plugin.version>
+      2.0.2
+    </org.apache.maven.plugins.maven-compiler-plugin.version>
+    <org.apache.maven.plugins.maven-jar-plugin.version>
+      2.2
+    </org.apache.maven.plugins.maven-jar-plugin.version>
+    <org.apache.maven.plugins.maven-plugin-plugin.version>
+      2.4.1
+    </org.apache.maven.plugins.maven-plugin-plugin.version>
     <org.apache.maven.plugins.maven-resources-plugin.version>
       2.2
     </org.apache.maven.plugins.maven-resources-plugin.version>
@@ -85,11 +98,11 @@
          </plugin>
          <plugin>
            <artifactId>maven-clean-plugin</artifactId>
-	   <version>2.2</version>
+	   <version>${org.apache.maven.plugins.maven-clean-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-compiler-plugin</artifactId>
-           <version>2.0.2</version>
+	   <version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-dependency-plugin</artifactId>
@@ -113,7 +126,7 @@
          </plugin>
          <plugin>
            <artifactId>maven-jar-plugin</artifactId>
-           <version>2.2</version>
+	   <version>${org.apache.maven.plugins.maven-jar-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-javadoc-plugin</artifactId>
@@ -121,7 +134,7 @@
          </plugin>
          <plugin>
            <artifactId>maven-plugin-plugin</artifactId>
-           <version>2.4.1</version>
+	   <version>${org.apache.maven.plugins.maven-plugin-plugin.version}</version>
          </plugin>
          <plugin>
            <artifactId>maven-rar-plugin</artifactId>

More information about the pkg-java-commits mailing list