[libjgoodies-common-java] 03/04: use --no-parent to ignore parent pom

Tony Mancill tmancill at moszumanska.debian.org
Sat Jan 30 20:33:26 UTC 2016


This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjgoodies-common-java.

commit 4beae8e3484280492a0fbc643a545b95820e024c
Author: tony mancill <tmancill at debian.org>
Date:   Sat Jan 30 12:28:16 2016 -0800

    use --no-parent to ignore parent pom
---
 debian/libjgoodies-common-java.poms |  2 +-
 debian/patches/build.patch          | 26 --------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/libjgoodies-common-java.poms b/debian/libjgoodies-common-java.poms
index 1d885c3..9f00db5 100644
--- a/debian/libjgoodies-common-java.poms
+++ b/debian/libjgoodies-common-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version --java-lib
+pom.xml --has-package-version --java-lib --no-parent
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
deleted file mode 100644
index 4b9a487..0000000
--- a/debian/patches/build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: disable unnecessary oss-parent from upstream pom
-Author: tony mancill <tmancill at debian.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -1,11 +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/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
-+    <!--
-     <parent>
-         <groupId>org.sonatype.oss</groupId>
-         <artifactId>oss-parent</artifactId>
-         <version>7</version>
-     </parent>
-+    -->
- 	<groupId>com.jgoodies</groupId>
- 	<artifactId>jgoodies-common</artifactId>
- 	<version>1.7.0</version>
-@@ -73,4 +75,4 @@
-              </plugin>
-          </plugins>
-      </build>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5879227..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjgoodies-common-java.git



More information about the pkg-java-commits mailing list