[SCM] UNNAMED PROJECT branch, master, updated. debian/2.3.1-2-6-g23d9be1
Jakub Adam
jakub.adam at ktknet.cz
Mon Jun 24 16:49:58 UTC 2013
The following commit has been merged in the master branch:
commit 20b327f613452f577821a274da8099d945aac748
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Tue Jun 11 19:39:25 2013 +0200
Use maven.ignoreRules to remove unnecessary maven plugins
diff --git a/debian/changelog b/debian/changelog
index 9a21ada..f2ce1fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
jgit (3.0.0-1) UNRELEASED; urgency=low
* New Upstream release.
+ * Use maven.ignoreRules to remove unnecessary maven plugins.
-- Jakub Adam <jakub.adam at ktknet.cz> Tue, 11 Jun 2013 19:22:57 +0200
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
index dfb0ea1..c7b01dc 100644
--- a/debian/libjgit-java.poms
+++ b/debian/libjgit-java.poms
@@ -1,6 +1,8 @@
pom.xml
org.eclipse.jgit/pom.xml
org.eclipse.jgit.ant/pom.xml --ignore-pom
+org.eclipse.jgit.console/pom.xml --ignore-pom
org.eclipse.jgit.http.server/pom.xml
org.eclipse.jgit.junit/pom.xml
-
+org.eclipse.jgit.pgm/pom.xml --ignore-pom
+org.eclipse.jgit.ui/pom.xml --ignore-pom
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..422b1e2
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+* maven-shade-plugin * * * *
+* maven-source-plugin * * * *
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 44e3213..8370e2e 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -9,35 +9,10 @@ Subject: debian-custom-build
- add org.eclipse.jgit.pgm to jgit console classpath
- don't build jgit console all-in-one executable
---
- org.eclipse.jgit.http.server/pom.xml | 4 ++--
- org.eclipse.jgit.pgm/jgit.sh | 2 +-
- org.eclipse.jgit.pgm/pom.xml | 6 +++---
- org.eclipse.jgit/pom.xml | 8 ++++----
- pom.xml | 27 ++++++++++++++-------------
- 5 files changed, 24 insertions(+), 23 deletions(-)
+ org.eclipse.jgit.pgm/jgit.sh | 2 +-
+ pom.xml | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
-diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
-index b4f9b40..76eb318 100644
---- a/org.eclipse.jgit.http.server/pom.xml
-+++ b/org.eclipse.jgit.http.server/pom.xml
-@@ -97,7 +97,7 @@
- </resources>
-
- <plugins>
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
-@@ -115,7 +115,7 @@
- </configuration>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
index 6b9ce40..3700d4f 100644
--- a/org.eclipse.jgit.pgm/jgit.sh
@@ -51,138 +26,11 @@ index 6b9ce40..3700d4f 100644
export CLASSPATH
java=java
-diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
-index 5041272..174b11a 100644
---- a/org.eclipse.jgit.pgm/pom.xml
-+++ b/org.eclipse.jgit.pgm/pom.xml
-@@ -104,7 +104,7 @@
- </dependencies>
- </profile>
- </profiles>
--
-+
- <build>
- <sourceDirectory>src/</sourceDirectory>
-
-@@ -123,7 +123,7 @@
- </resources>
-
- <plugins>
-- <plugin>
-+ <!--plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-@@ -236,7 +236,7 @@
- </configuration>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
- </plugins>
- </build>
- </project>
-diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
-index ecc09be..e769710 100644
---- a/org.eclipse.jgit/pom.xml
-+++ b/org.eclipse.jgit/pom.xml
-@@ -115,7 +115,7 @@
- </executions>
- </plugin>
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
-@@ -133,7 +133,7 @@
- </configuration>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
-@@ -152,13 +152,13 @@
-
- <pluginManagement>
- <plugins>
-- <plugin>
-+ <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <excludeFilterFile>findBugs/FindBugsExcludeFilter.xml</excludeFilterFile>
- </configuration>
-- </plugin>
-+ </plugin-->
- </plugins>
- </pluginManagement>
- </build>
diff --git a/pom.xml b/pom.xml
-index cbf6aa1..da258ca 100644
+index 4c27438..aff8b24 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -223,11 +223,11 @@
- <version>2.5</version>
- </plugin>
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-@@ -241,11 +241,11 @@
- <version>2.5</version>
- </plugin>
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2</version>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-@@ -265,7 +265,7 @@
- <version>1.7</version>
- </plugin>
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
-@@ -280,9 +280,9 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
-@@ -300,7 +300,7 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-@@ -370,6 +370,7 @@
+@@ -371,6 +371,7 @@
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
</links>
@@ -190,25 +38,7 @@ index cbf6aa1..da258ca 100644
</configuration>
<executions>
<execution>
-@@ -380,7 +381,7 @@
- </execution>
- </executions>
- </plugin>
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
-@@ -393,7 +394,7 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
- </plugins>
- </build>
-
-@@ -483,11 +484,11 @@
+@@ -503,11 +504,11 @@
<module>org.eclipse.jgit.http.server</module>
<module>org.eclipse.jgit.pgm</module>
<module>org.eclipse.jgit.junit</module>
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list