[maven-debian-helper] 09/21: Remove no-docs build due to Maven 3 update
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 13 15:05:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-debian-helper-2.0
in repository maven-debian-helper.
commit b5108988927c698e00bbae2f2ebf2e440bb120c4
Author: Andrew Schurman <arcticwaters at gmail.com>
Date: Tue Sep 16 20:09:52 2014 -0700
Remove no-docs build due to Maven 3 update
This appears to have been needed to disable executions when dealing with
pom-typed projects. Since the default executions for these projects in
Maven 3 also removed executions that we disabled in Maven 2, this special
configuration is no longer needed.
---
debian/changelog | 1 +
debian/maven-debian-helper.poms | 1 -
debian/rules | 5 +--
etc/m2-debian-nodocs.conf | 9 ----
maven-build-nodocs/pom.xml | 20 ---------
.../main/resources/META-INF/plexus/components.xml | 48 ----------------------
pom.xml | 1 -
share/cdbs/1/class/maven.mk | 1 -
share/perl/maven.pm | 6 ---
9 files changed, 2 insertions(+), 90 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 84a8490..b813e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-debian-helper (2.0.0) UNRELEASED; urgency=medium
* Update Maven to version 3.0.5
* Build deb package using itself rather than maven-ant-helper
* Update mojos to use annotations
+ * Remove nodocs build due to Maven 3 update
-- Andrew Schurman <arcticwaters at gmail.com> Mon, 16 Mar 2015 18:48:32 -0700
diff --git a/debian/maven-debian-helper.poms b/debian/maven-debian-helper.poms
index d16f3bf..7d1abaa 100644
--- a/debian/maven-debian-helper.poms
+++ b/debian/maven-debian-helper.poms
@@ -1,5 +1,4 @@
pom.xml --no-parent --has-package-version
maven-debian-helper/pom.xml --has-package-version --artifact=maven-debian-helper/target/maven-debian-helper-*.jar --java-lib
debian-maven-plugin/pom.xml --has-package-version --artifact=debian-maven-plugin/target/debian-maven-plugin-*.jar --java-lib
-maven-build-nodocs/pom.xml --has-package-version --artifact=maven-build-nodocs/target/maven-build-nodocs-*.jar --java-lib
maven-packager-utils/pom.xml --has-package-version --artifact=maven-packager-utils/target/maven-packager-utils-*.jar --java-lib
diff --git a/debian/rules b/debian/rules
index 4db860f..f6d0fd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,6 @@ DEB_MAVEN_PROPERTYFILE:= $(ROOT_DIR)/debian/build.properties
DEB_MAVEN_SCRIPT_DIR := $(ROOT_DIR)/share/maven-debian-helper/
-# need to use local class config
-debian/stamp-maven-build: override MAVEN_CLASSCONF=$(ROOT_DIR)/etc/m2-debian-nodocs.conf
-
# clean happens before we get a chance to bootstrap (and we don't need sugar yet)
clean:: override MAVEN_CLASSCONF=/etc/maven/m2.conf
clean:: override JAVA_OPTS+="-Dmaven.home=$(MAVEN_HOME)"
@@ -80,7 +77,7 @@ clean::
# Helper target, to use when updating the version of this package
update-package-version:
perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" pom.xml
- perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" maven-build-nodocs/pom.xml maven-debian-helper/pom.xml debian-maven-plugin/pom.xml
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" maven-debian-helper/pom.xml debian-maven-plugin/pom.xml
perl -p -i -e "s/maven-debian-helper \(>= ([0-9\.]+)\)/maven-debian-helper \(>= ${VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
diff --git a/etc/m2-debian-nodocs.conf b/etc/m2-debian-nodocs.conf
deleted file mode 100644
index 5482d1d..0000000
--- a/etc/m2-debian-nodocs.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-main is org.debian.maven.Wrapper from debian
-
-set maven.home default /usr/share/maven
-
-[debian]
-load /usr/share/java/maven-debian-helper.jar
-load /usr/share/java/maven-build-nodocs.jar
-optionally ${maven.home}/lib/ext/*.jar
-load ${maven.home}/lib/*.jar
diff --git a/maven-build-nodocs/pom.xml b/maven-build-nodocs/pom.xml
deleted file mode 100644
index 5d99440..0000000
--- a/maven-build-nodocs/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.debian.maven</groupId>
- <artifactId>maven-debian</artifactId>
- <version>2.0.0</version>
- </parent>
-
- <artifactId>maven-build-nodocs</artifactId>
- <packaging>jar</packaging>
- <name>build with no docs patch for Maven</name>
-
- <description>
- Patch to prevent Maven from calling maven-site-plugin when
- we run a build that does not need to produce any documentation
- </description>
-
-</project>
diff --git a/maven-build-nodocs/src/main/resources/META-INF/plexus/components.xml b/maven-build-nodocs/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index ee0cba4..0000000
--- a/maven-build-nodocs/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-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.
--->
-
-<component-set>
- <components>
-
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>pom</role-hint>
- <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
- <configuration>
- <lifecycles>
- <lifecycle>
- <id>default</id>
- <!-- START SNIPPET: pom-lifecycle -->
- <phases>
- <package></package>
- <install>org.apache.maven.plugins:maven-install-plugin:install</install>
- <deploy></deploy>
- </phases>
- <!--optional-mojos>
- <optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
- </optional-mojos-->
- <!-- END SNIPPET: pom-lifecycle -->
- </lifecycle>
- </lifecycles>
- </configuration>
- </component>
-
- </components>
-
-</component-set>
diff --git a/pom.xml b/pom.xml
index caf604d..b26f257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
<modules>
<module>maven-debian-helper</module>
<module>debian-maven-plugin</module>
- <module>maven-build-nodocs</module>
<module>maven-packager-utils</module>
</modules>
diff --git a/share/cdbs/1/class/maven.mk b/share/cdbs/1/class/maven.mk
index e9ada73..c475a6d 100644
--- a/share/cdbs/1/class/maven.mk
+++ b/share/cdbs/1/class/maven.mk
@@ -61,7 +61,6 @@ debian/maven.rules:
ifeq (, $(DEB_DOC_PACKAGE))
DEB_PATCHPOMS_ARGS += --build-no-docs
-debian/stamp-maven-build: override MAVEN_CLASSCONF = /etc/maven/m2-debian-nodocs.conf
endif
debian/stamp-poms-patched: debian/maven-repo
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 799d2dc..326382d 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -27,9 +27,6 @@ sub new {
$this->{package} = shift @packages;
$this->{doc_package} = (grep /-doc$/, @packages)[0];
my $classconf = '/etc/maven/m2-debian.conf';
- if (!$this->{doc_package}) {
- $classconf = '/etc/maven/m2-debian-nodocs.conf';
- }
my @classpath = ('/usr/share/maven/boot/classworlds-2.x.jar');
if (-e "$java_home/lib/tools.jar") {
@@ -54,9 +51,6 @@ sub new {
sub configure {
my $this=shift;
my @patch_args;
- if (! $this->{doc_package}) {
- push(@patch_args, "--build-no-docs");
- }
doit("/usr/share/maven-debian-helper/copy-repo.sh", "$this->{cwd}/debian");
$this->doit_in_sourcedir("mh_patchpoms", "-p$this->{package}",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git
More information about the pkg-java-commits
mailing list