Commit 19eec2c19d6d10c06b3da77325f24c7cd95e4273 - maven-debian-helper

+4

-0

debian/build.properties less more

	0	build.directory=target
	1	build.javaVersion=1.6
	2	javadoc.dir=target/api
	3	classpath.test=/usr/share/java/junit4.jar
0	4	maven.test.skip=true
1	5

+65

-0

debian/build.xml less more

	0	<?xml version="1.0"?>
	1
	2	<project name="pkg-java" default="package" basedir="..">
	3
	4	<property file="debian/build.properties"/>
	5	<property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
	6	<property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
	7
	8	<macrodef name="cleanmodule">
	9	<attribute name="dir"/>
	10	<sequential>
	11	<ant target="clean" antfile="${maven.build}" dir="@{dir}">
	12	<property name="debian.dir" location="debian" />
	13	<property name="project.dir" value="@{dir}" />
	14	</ant>
	15	</sequential>
	16	</macrodef>
	17
	18	<macrodef name="packagemodule">
	19	<attribute name="dir"/>
	20	<sequential>
	21	<ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
	22	<property name="debian.dir" location="debian" />
	23	<property name="project.dir" value="@{dir}" />
	24	<property name="keep-cleaned-pom" value="true" />
	25	</ant>
	26	</sequential>
	27	</macrodef>
	28
	29	<macrodef name="package-plugin-module">
	30	<attribute name="dir"/>
	31	<sequential>
	32	<ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
	33	<property name="debian.dir" location="debian" />
	34	<property name="project.dir" value="@{dir}" />
	35	<property name="maven.generate.target" value="plugin:descriptor" />
	36	<property name="keep-cleaned-pom" value="true" />
	37	<property name="use-local-repo" value="true" />
	38	</ant>
	39	</sequential>
	40	</macrodef>
	41
	42	<target name="clean">
	43	<cleanmodule dir=""/>
	44	<cleanmodule dir="maven-debian-helper"/>
	45	<cleanmodule dir="debian-maven-plugin"/>
	46	<cleanmodule dir="maven-packager-utils"/>
	47	</target>
	48
	49	<target name="package">
	50	<packagemodule dir=""/>
	51	<packagemodule dir="maven-debian-helper"/>
	52	<package-plugin-module dir="debian-maven-plugin"/>
	53	<package-plugin-module dir="maven-packager-utils"/>
	54	</target>
	55
	56	<target name="javadoc">
	57	<javadoc destdir="${javadoc.dir}">
	58	<packageset dir="maven-debian-helper/src/main/java/"/>
	59	<packageset dir="debian-maven-plugin/src/main/java/"/>
	60	<packageset dir="maven-packager-utils/src/main/java/"/>
	61	</javadoc>
	62	</target>
	63
	64	</project>

+0

-1

debian/changelog less more

0	0	maven-debian-helper (2.0) UNRELEASED; urgency=medium
1	1
2	2	* Update Maven to version 3.0.5
3		* Build deb package using itself rather than maven-ant-helper
4	3	* Update mojos to use annotations
5	4	* Remove nodocs build due to Maven 3 update
6	5

+2

-2

debian/control less more

7	7	Thomas Koch <thomas@koch.ro>,
8	8	Emmanuel Bourg <ebourg@apache.org>,
9	9	Wolodja Wentland <debian@babilen5.org>
10		Build-Depends: cdbs, debhelper (>= 9), default-jdk, help2man
	10	Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-ant-helper (>= 7.0), ant-optional, help2man
11	11	Build-Depends-Indep: junit4,
12	12	libcommons-io-java,
13		libmaven-install-plugin-java,
	13	libmaven3-core-java,
14	14	libmaven-plugin-tools-java,
15	15	libplexus-velocity-java,
16	16	maven-repo-helper (>= 1.8.9)

+8

-26

debian/rules less more

0	0	#!/usr/bin/make -f
1	1
2		ROOT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/..
3		# ensure that maven.mk is able to include necessary files
4		_cdbs_class_path = $(ROOT_DIR)/share/cdbs/1/class
5
6	2	include /usr/share/cdbs/1/rules/debhelper.mk
7		include $(ROOT_DIR)/share/cdbs/1/class/maven.mk
	3	include /usr/share/cdbs/1/class/ant.mk
8	4
9	5	PACKAGE := $(DEB_SOURCE_PACKAGE)
10	6	VERSION := $(shell echo ${DEB_UPSTREAM_VERSION} \| sed -r 's/([0-9\.]+).*/\1/')
11	7	JAVA_HOME := /usr/lib/jvm/default-java
12		MAVEN_CLASSCONF_ORIG := $(ROOT_DIR)/etc/m2-debian.conf
13		MAVEN_CLASSCONF_REAL := $(ROOT_DIR)/debian/.mh/etc/m2-debian.conf
14		MAVEN_CLASSCONF := $(MAVEN_CLASSCONF_REAL)
15		MAVEN_SETTINGS := $(ROOT_DIR)/etc/settings-debian.xml
16		DEB_MAVEN_PROPERTYFILE:= $(ROOT_DIR)/debian/build.properties
17		DEB_MAVEN_SCRIPT_DIR := $(ROOT_DIR)/share/maven-debian-helper/
18
19
20		# clean happens before we get a chance to bootstrap (and we don't need sugar yet)
21		clean:: override MAVEN_CLASSCONF=/etc/maven/m2.conf
22		clean:: override JAVA_OPTS+="-Dmaven.home=$(MAVEN_HOME)"
23
24		# bootstrap the build process
25		before-mvn-build:: override MAVEN_CLASSCONF=/etc/maven/m2.conf
26		before-mvn-build:: override JAVA_OPTS+="-Dmaven.home=$(MAVEN_HOME)"
27		before-mvn-build::
28		$(DEB_MAVEN_INVOKE) -Dmaven.test.skip -Djar.finalName=maven-debian-helper install
29		cp maven-debian-helper/target/maven-debian-helper.jar debian/.mh/
30		sed 's\|load .*/maven-debian-helper.jar\|load $(ROOT_DIR)/debian/.mh/maven-debian-helper.jar\|g' $(MAVEN_CLASSCONF_ORIG) > $(MAVEN_CLASSCONF_REAL)
31		$(DEB_MAVEN_INVOKE) clean
32
	8	DEB_JARS := ant-junit junit commons-io plexus-classworlds maven-core maven-artifact maven-artifact-manager maven-core-3.x maven-model \
	9	maven-embedder maven-plugin-api maven-plugin-annotations maven-scm-api velocity file-management plexus-utils \
	10	plexus-container-default-alpha maven-repo-helper
	11	DEB_ANT_BUILD_TARGET := package #javadoc
	12	DEB_ANT_BUILDFILE := debian/build.xml
	13	DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
	14	API_DOCS := target/api
33	15
34	16	debian/.mh:
35	17	mkdir -p debian/.mh

+1

-2

share/cdbs/1/class/maven-vars.mk less more

36	36
37	37	MAVEN_DEBIAN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ \| sed 's\|/\|\|')
38	38	MAVEN_CLASSCONF = /etc/maven/m2-debian.conf
39		MAVEN_SETTINGS = /etc/maven/settings-debian.xml
40	39
41	40	# The home directory of the Java Runtime Environment (JRE) or Java Development
42	41	# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set

94	93	DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
95	94	$(JAVA_OPTS) -Dclassworlds.conf=$(MAVEN_CLASSCONF) \
96	95	org.codehaus.classworlds.Launcher \
97		-s$(MAVEN_SETTINGS) \
	96	-s/etc/maven/settings-debian.xml \
98	97	-Dmaven.repo.local=$(DEB_MAVEN_REPO) \
99	98	$(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
100	99

+1

-2

share/cdbs/1/class/maven.mk less more

31	31	include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix)
32	32
33	33	DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
34		DEB_MAVEN_SCRIPT_DIR := /usr/share/maven-debian-helper/
35	34
36	35	JAVA_OPTS = \
37	36	$(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE))

79	78	$(RM) -f debian/stamp-poms-patched
80	79
81	80	debian/maven-repo:
82		$(DEB_MAVEN_SCRIPT_DIR)/copy-repo.sh $(CURDIR)/debian
	81	/usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
83	82
84	83	post-patches:: patch-poms
85	84