This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libgoogle-gson-java.
commit 6a3dc9fca19ae30e5cf2cc3be17bceb621f8606d Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 27 12:27:31 2013 +0200 Removed custom-build.patch and use Maven rules to ignore the unused dependencies --- debian/libgoogle-gson-java.poms | 27 +++++- debian/maven.ignoreRules | 26 +++--- debian/patches/custom-build.patch | 167 ------------------------------------- debian/patches/series | 1 - 4 files changed, 35 insertions(+), 186 deletions(-) diff --git a/debian/libgoogle-gson-java.poms b/debian/libgoogle-gson-java.poms index 0393e2e..b68401f 100644 --- a/debian/libgoogle-gson-java.poms +++ b/debian/libgoogle-gson-java.poms @@ -1,7 +1,28 @@ # List of POM files for the package # Format of this file is: -# <path to pom file> [option] +# <path to pom file> [option]* # where option can be: -# --ignore: ignore this POM or +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the <parent> tag from the POM -pom.xml --java-lib +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 0088a40..fb00380 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,16 +1,12 @@ -# Maven ignore rules - ignore some Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\\..*/3.x/ +org.apache.maven.plugins maven-changelog-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * s/.*/debian/ * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-release-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * +org.codehaus.mojo taglist-maven-plugin * * * * +org.sonatype.oss oss-parent * * * * diff --git a/debian/patches/custom-build.patch b/debian/patches/custom-build.patch deleted file mode 100644 index ef2dc27..0000000 --- a/debian/patches/custom-build.patch +++ /dev/null @@ -1,167 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Thu, 5 Jan 2012 23:35:26 +0100 -Subject: custom-build - ---- - pom.xml | 119 --------------------------------------------------------------- - 1 files changed, 0 insertions(+), 119 deletions(-) - -diff --git a/pom.xml b/pom.xml -index c2a949d..a91734b 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -6,11 +6,6 @@ - <version>2.1</version> - <inceptionYear>2008</inceptionYear> - <name>Gson</name> -- <parent> -- <groupId>org.sonatype.oss</groupId> -- <artifactId>oss-parent</artifactId> -- <version>5</version> -- </parent> - <url>http://code.google.com/p/google-gson/</url> - <description>Google Gson library</description> - <properties> -@@ -116,21 +111,6 @@ - </archive> - </configuration> - </plugin> -- <plugin> -- <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids --> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-source-plugin</artifactId> -- <version>2.1.2</version> -- <executions> -- <execution> -- <id>attach-sources</id> -- <phase>verify</phase> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> - <plugin> - <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids --> - <groupId>org.apache.maven.plugins</groupId> -@@ -154,60 +134,6 @@ - <show>public</show> - </configuration> - </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-eclipse-plugin</artifactId> -- <version>2.8</version> -- <configuration> -- <downloadSources>true</downloadSources> -- <downloadJavadocs>true</downloadJavadocs> -- <workspace> -- ../eclipse-ws/ -- </workspace> -- <workspaceCodeStylesURL> -- file:///${basedir}/../lib/gson-formatting-styles.xml -- </workspaceCodeStylesURL> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-jxr-plugin</artifactId> -- <version>2.2</version> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-pmd-plugin</artifactId> -- <version>2.5</version> -- <configuration> -- <targetJdk>1.5</targetJdk> -- <rulesets> -- <ruleset>/rulesets/basic.xml</ruleset> -- <ruleset>/rulesets/imports.xml</ruleset> -- <ruleset>/rulesets/unusedcode.xml</ruleset> -- <ruleset>/rulesets/finalizers.xml</ruleset> -- </rulesets> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-checkstyle-plugin</artifactId> -- <version>2.6</version> -- <configuration> -- <!-- configLocation>config/sun_checks.xml</configLocation --> -- <configLocation>config/maven_checks.xml</configLocation> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.codehaus.mojo</groupId> -- <artifactId>taglist-maven-plugin</artifactId> -- <version>2.4</version> -- <configuration> -- <multipleLineComments>true</multipleLineComments> -- <tags> -- <tag>TODO</tag> -- </tags> -- </configuration> -- </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> -@@ -222,15 +148,6 @@ - </executions> - </plugin> - <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-release-plugin</artifactId> -- <!-- version>2.2.1</version --> -- <configuration> -- <arguments>-DenableCiProfile=true</arguments> -- <tagBase>https://google-gson.googlecode.com/svn/tags</tagBase> -- </configuration> -- </plugin> -- <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.2</version> - <configuration> -@@ -242,42 +159,6 @@ - </plugin> - </plugins> - </build> -- <reporting> -- <plugins> -- <plugin> -- <groupId>org.codehaus.mojo</groupId> -- <artifactId>findbugs-maven-plugin</artifactId> -- <version>2.3.2</version> -- <configuration> -- <xmlOutput>true</xmlOutput> -- <!-- Optional derectory to put findbugs xdoc xml report --> -- <xmlOutputDirectory>target/site</xmlOutputDirectory> -- </configuration> -- </plugin> -- <plugin> -- <!-- if this fails, it means you have no svn installed --> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-changelog-plugin</artifactId> -- <version>2.2</version> -- <configuration> -- <type>range</type> -- <range>3650</range> -- </configuration> -- </plugin> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-changes-plugin</artifactId> -- <version>2.4</version> -- <reportSets> -- <reportSet> -- <reports> -- <report>changes-report</report> -- </reports> -- </reportSet> -- </reportSets> -- </plugin> -- </plugins> -- </reporting> - <developers> - <developer> - <name>Inderjeet Singh</name> --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index eadb62d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -custom-build.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgoogle-gson-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
