[pkg-java] r9017 - in trunk/maven-compiler-plugin/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Jul 8 23:58:55 UTC 2009
Author: ludovicc-guest
Date: 2009-07-08 23:58:55 +0000 (Wed, 08 Jul 2009)
New Revision: 9017
Added:
trunk/maven-compiler-plugin/debian/build.properties
trunk/maven-compiler-plugin/debian/libmaven-compiler-plugin-java.poms
trunk/maven-compiler-plugin/debian/maven.rules
trunk/maven-compiler-plugin/debian/patches/descriptor.patch
Removed:
trunk/maven-compiler-plugin/debian/ant.properties
trunk/maven-compiler-plugin/debian/build.xml
trunk/maven-compiler-plugin/debian/patches/pom.diff
Modified:
trunk/maven-compiler-plugin/debian/changelog
trunk/maven-compiler-plugin/debian/compat
trunk/maven-compiler-plugin/debian/control
trunk/maven-compiler-plugin/debian/copyright
trunk/maven-compiler-plugin/debian/orig-tar.sh
trunk/maven-compiler-plugin/debian/patches/series
trunk/maven-compiler-plugin/debian/rules
Log:
* Change section to java, bump up Standards-Version to 3.8.1
* Bump up debhelper to 6
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
* Remove the patch for the POM as it's no longer needed
* Remove Depends on Java runtimes as it is a library
* Add a patch for the Plexus descriptor
Deleted: trunk/maven-compiler-plugin/debian/ant.properties
===================================================================
--- trunk/maven-compiler-plugin/debian/ant.properties 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/ant.properties 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-build.directory=target
-build.outputDirectory=target/classes
-maven.test.skip=true
Added: trunk/maven-compiler-plugin/debian/build.properties
===================================================================
--- trunk/maven-compiler-plugin/debian/build.properties (rev 0)
+++ trunk/maven-compiler-plugin/debian/build.properties 2009-07-08 23:58:55 UTC (rev 9017)
@@ -0,0 +1,4 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+maven.generate.target=plugin:descriptor
Deleted: trunk/maven-compiler-plugin/debian/build.xml
===================================================================
--- trunk/maven-compiler-plugin/debian/build.xml 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/build.xml 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- </target>
-
- <target name="package">
- <java classname="org.codehaus.classworlds.Launcher"
- classpath="/usr/share/maven2/boot/classworlds.jar"
- failonerror="true" fork="true">
- <sysproperty key="classworlds.conf" value="/etc/maven2/m2.conf"/>
- <sysproperty key="maven.home" value="/usr/share/maven2"/>
- <arg value="-Dmaven.test.skip"/>
- <arg value="-s${basedir}/debian/maven-settings.xml"/>
- <arg value="plugin:descriptor"/>
- </java>
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="maven-compiler-plugin"/>
- </ant>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
Modified: trunk/maven-compiler-plugin/debian/changelog
===================================================================
--- trunk/maven-compiler-plugin/debian/changelog 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/changelog 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,3 +1,16 @@
+maven-compiler-plugin (2.0.2-2) unstable; urgency=low
+
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Bump up debhelper to 6
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove the patch for the POM as it's no longer needed
+ * Remove Depends on Java runtimes as it is a library
+ * Add a patch for the Plexus descriptor
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 19 May 2009 13:51:41 +0100
+
maven-compiler-plugin (2.0.2-1) unstable; urgency=low
* Initial release. (Closes: #508088)
Modified: trunk/maven-compiler-plugin/debian/compat
===================================================================
--- trunk/maven-compiler-plugin/debian/compat 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/compat 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1 +1 @@
-5
+6
Modified: trunk/maven-compiler-plugin/debian/control
===================================================================
--- trunk/maven-compiler-plugin/debian/control 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/control 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,21 +1,22 @@
Source: maven-compiler-plugin
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
+Build-Depends: default-jdk, debhelper (>= 6), cdbs, quilt
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ junit, libplexus-velocity-java, velocity,
libmaven-plugin-tools-java, libplexus-compiler-api-java,
libplexus-compiler-manager-java, libplexus-compiler-javac-java,
libplexus-interpolation-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-compiler-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-compiler-plugin/
Homepage: http://maven.apache.org/plugins/maven-compiler-plugin/
Package: libmaven-compiler-plugin-java
Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-plugin-tools-java,
+Depends: ${misc:Depends}, libmaven-plugin-tools-java,
libplexus-compiler-api-java, libplexus-compiler-manager-java,
libplexus-compiler-javac-java
Description: Maven compiler plugin
Modified: trunk/maven-compiler-plugin/debian/copyright
===================================================================
--- trunk/maven-compiler-plugin/debian/copyright 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/copyright 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,32 +1,22 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Maven Compiler Plugin
+Maintainer: Apache Maven team
+Source: http://maven.apache.org/
-The Debian packaging is Copyright (c) 2008 Torsten Werner and is
-licensed under the GNU General Public License version 3. On Debian
-systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+Files: *
+Copyright: 2001-2009, The Apache Software Foundation.
+License: Apache-2.0
-The package was downloaded from <http://maven.apache.org>.
+Files: debian/*
+Copyright: 2008, Torsten Werner <twerner at debian.org>.
+License: GPL-3+
-Copyright: 2006-2007 The Apache Software Foundation.
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
-License:
+License: GPL-3
+ On Debian GNU/Linux system you can find the complete text of the
+ GNU General Public License version 3 license in
+ '/usr/share/common-licenses/GPL-3'.
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-The full text of the license can be found in
-`/usr/share/common-licenes/Apache-2.0'.
Added: trunk/maven-compiler-plugin/debian/libmaven-compiler-plugin-java.poms
===================================================================
--- trunk/maven-compiler-plugin/debian/libmaven-compiler-plugin-java.poms (rev 0)
+++ trunk/maven-compiler-plugin/debian/libmaven-compiler-plugin-java.poms 2009-07-08 23:58:55 UTC (rev 9017)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-compiler-plugin/debian/maven.rules
===================================================================
--- trunk/maven-compiler-plugin/debian/maven.rules (rev 0)
+++ trunk/maven-compiler-plugin/debian/maven.rules 2009-07-08 23:58:55 UTC (rev 9017)
@@ -0,0 +1,3 @@
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
Property changes on: trunk/maven-compiler-plugin/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/maven-compiler-plugin/debian/patches/descriptor.patch
===================================================================
--- trunk/maven-compiler-plugin/debian/patches/descriptor.patch (rev 0)
+++ trunk/maven-compiler-plugin/debian/patches/descriptor.patch 2009-07-08 23:58:55 UTC (rev 9017)
@@ -0,0 +1,11 @@
+--- a/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
++++ b/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
+@@ -235,7 +235,7 @@
+ /**
+ * Plexus compiler manager.
+ *
+- * @component
++ * @component role="org.codehaus.plexus.compiler.manager.CompilerManager"
+ */
+ private CompilerManager compilerManager;
+
Deleted: trunk/maven-compiler-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-compiler-plugin/debian/patches/pom.diff 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/patches/pom.diff 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1,88 +0,0 @@
-Index: maven-compiler-plugin-2.0.2/pom.xml
-===================================================================
---- maven-compiler-plugin-2.0.2.orig/pom.xml 2008-12-07 20:37:50.000000000 +0100
-+++ maven-compiler-plugin-2.0.2/pom.xml 2008-12-07 20:05:54.000000000 +0100
-@@ -1,10 +1,13 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-+ <!--
- <parent>
- <artifactId>maven-plugins</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>8</version>
- </parent>
-+ -->
- <modelVersion>4.0.0</modelVersion>
-+ <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Maven Compiler Plugin</name>
-@@ -21,29 +24,39 @@
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
-- <version>2.0</version>
-+ <version>2.0.9</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/maven2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
-- <version>1.0.4</version>
-+ <version>1.4.8</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-api</artifactId>
- <version>1.5.3</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-compiler-api.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-manager</artifactId>
- <version>1.5.3</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-compiler-manager.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac</artifactId>
- <version>1.5.3</version>
-- <scope>runtime</scope>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-compiler-javac.jar</systemPath>
- </dependency>
-+ <!--
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
-@@ -55,11 +68,24 @@
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
-+ -->
- </dependencies>
-
-+ <build>
-+ <pluginManagement>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-plugin-plugin</artifactId>
-+ <version>2.4.3</version>
-+ </plugin>
-+ </plugins>
-+ </pluginManagement>
-+ </build>
-+
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</url>
- </scm>
--</project>
-\ No newline at end of file
-+</project>
Modified: trunk/maven-compiler-plugin/debian/patches/series
===================================================================
--- trunk/maven-compiler-plugin/debian/patches/series 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/patches/series 2009-07-08 23:58:55 UTC (rev 9017)
@@ -1 +1 @@
-pom.diff
+descriptor.patch
Modified: trunk/maven-compiler-plugin/debian/rules
===================================================================
--- trunk/maven-compiler-plugin/debian/rules 2009-07-08 23:57:02 UTC (rev 9016)
+++ trunk/maven-compiler-plugin/debian/rules 2009-07-08 23:58:55 UTC (rev 9017)
@@ -4,22 +4,22 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_JARS := maven2 plexus-compiler-api plexus-compiler-manager \
- plexus-utils
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-project maven-artifact maven-artifact-manager \
+ plexus-compiler-api plexus-compiler-manager plexus-utils
DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
-API_DOCS := build/api
+DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS := target/api
get-orig-source:
- uscan --force-download
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-REPO := /usr/share/maven-repo
-PLUGINS := $(REPO)/org/apache/maven/plugins
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
-binary-post-install/lib$(PACKAGE)-java::
- dh_install target/*.jar $(PLUGINS)/$(PACKAGE)/$(VERSION)/
- install -m644 pom.xml $(DEB_DESTDIR)$(PLUGINS)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom
+clean::
+ -rm -rf debian/tmp
Property changes on: trunk/maven-compiler-plugin/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list