[libparanamer-java] 02/07: Repackaged the upstream tarball to include the full source tree from Github Build with maven-debian-helper Build the paranamer-maven-plugin (Closes: #776586)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jan 30 13:46:59 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository libparanamer-java.

commit e0eb494109e515ca60ed01de0cc6895fb94c4511
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 30 14:00:06 2015 +0100

    Repackaged the upstream tarball to include the full source tree from Github
    Build with maven-debian-helper
    Build the paranamer-maven-plugin (Closes: #776586)
---
 debian/changelog                     |   5 +-
 debian/control                       |  35 ++++----
 debian/libparanamer-java-doc.javadoc |   1 -
 debian/libparanamer-java.jlibs       |   1 -
 debian/libparanamer-java.poms        |  35 +++++++-
 debian/maven.ignoreRules             |  11 +++
 debian/maven.properties              |   5 ++
 debian/maven.publishedRules          |   2 +
 debian/maven.rules                   |   4 +
 debian/pom.xml                       | 152 -----------------------------------
 debian/rules                         |  22 ++---
 11 files changed, 83 insertions(+), 190 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41d5a13..686cf0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-libparanamer-java (2.7-2) UNRELEASED; urgency=medium
+libparanamer-java (2.7+repack-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Repackaged the upstream tarball to include the full source tree from Github
+  * Build with maven-debian-helper
+  * Build the paranamer-maven-plugin (Closes: #776586)
   * Do not reference the parent POM in the paranamer's POM (Closes: #776583)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 29 Jan 2015 16:53:28 +0100
diff --git a/debian/control b/debian/control
index 949459c..aef6565 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,34 @@ Source: libparanamer-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Markus Koschany <apo at gambaru.de>
+Uploaders: Markus Koschany <apo at gambaru.de>
 Build-Depends:
+ cdbs,
  debhelper (>= 9),
  javahelper,
- maven-repo-helper (>= 1.6~)
+ maven-debian-helper
 Build-Depends-Indep:
  default-jdk,
  default-jdk-doc,
- libatinject-jsr330-api-java
+ libasm3-java,
+ libatinject-jsr330-api-java,
+ libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-plugin-tools-java,
+ libmaven2-core-java,
+ libqdox-java,
+ maven
 Standards-Version: 3.9.6
-Homepage: https://github.com/paul-hammant/paranamer
 Vcs-Git: git://anonscm.debian.org/pkg-java/libparanamer-java.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libparanamer-java.git
+Homepage: https://github.com/paul-hammant/paranamer
 
 Package: libparanamer-java
 Architecture: all
-Depends:
- ${java:Depends},
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Suggests:
- libparanamer-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: libparanamer-java-doc, ${maven:OptionalDepends}
 Description: Java library to access method parameter names at runtime
  Paranamer is a library that allows the parameter names of non-private methods
  and constructors to be accessed at runtime. Normally this information is
@@ -38,11 +42,8 @@ Description: Java library to access method parameter names at runtime
 Package: libparanamer-java-doc
 Section: doc
 Architecture: all
-Depends:
- ${misc:Depends}
-Recommends:
- default-jdk-doc,
- ${java:Recommends}
+Depends: ${misc:Depends}
+Suggests: default-jdk-doc
 Description: Java library to access method parameter names at runtime -- docs
  Paranamer is a library that allows the parameter names of non-private methods
  and constructors to be accessed at runtime.
diff --git a/debian/libparanamer-java-doc.javadoc b/debian/libparanamer-java-doc.javadoc
deleted file mode 100644
index ce83b25..0000000
--- a/debian/libparanamer-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal
diff --git a/debian/libparanamer-java.jlibs b/debian/libparanamer-java.jlibs
deleted file mode 100644
index 73c1056..0000000
--- a/debian/libparanamer-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-paranamer-2.7.jar
diff --git a/debian/libparanamer-java.poms b/debian/libparanamer-java.poms
index 3f7eaf4..98115c6 100644
--- a/debian/libparanamer-java.poms
+++ b/debian/libparanamer-java.poms
@@ -1 +1,34 @@
-debian/pom.xml --no-parent --usj-name=paranamer
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --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
+#   --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 --has-package-version
+paranamer-generator/pom.xml --has-package-version --java-lib
+paranamer-maven-plugin/pom.xml --has-package-version
+paranamer/pom.xml --has-package-version --java-lib
+paranamer-ant/pom.xml --ignore
+paranamer-distribution/pom.xml --ignore
+paranamer-integration-tests/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..ba26e77
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,11 @@
+
+junit junit * * * *
+net.sourceforge.f2j arpack_combined_all * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.maven.plugins maven-surefire-report-plugin * * * *
+org.apache.maven.wagon wagon-webdav * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.eclipse.m2e lifecycle-mapping * * * *
+org.mockito mockito-all * * * *
+com.thoughtworks.paranamer paranamer * * javadoc *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..619c41e
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,2 @@
+
+com.thoughtworks.paranamer paranamer s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9ccfb93
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+
+junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+asm asm * s/3\..*/3.x/ * *
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index f263ff0..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,152 +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>com.thoughtworks.paranamer</groupId>
-    <artifactId>paranamer-parent</artifactId>
-    <version>2.7</version>
-  </parent>
-  <artifactId>paranamer</artifactId>
-  <packaging>bundle</packaging>
-  <name>ParaNamer Core</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>net.sourceforge.f2j</groupId>
-        <artifactId>arpack_combined_all</artifactId>
-        <version>0.1</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>net.sourceforge.f2j</groupId>
-        <artifactId>arpack_combined_all</artifactId>
-        <version>0.1</version>
-        <classifier>javadoc</classifier>
-        <scope>test</scope>
-    </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>${project.artifactId}</artifactId>
-          <version>2.5.5</version>
-          <classifier>javadoc</classifier>
-          <scope>test</scope>
-      </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-source-plugin</artifactId>
-			<executions>
-				<execution>
-					<id>attach-sources</id>
-					<goals>
-						<goal>jar</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-javadoc-plugin</artifactId>
-			<executions>
-				<execution>
-					<id>attach-javadocs</id>
-					<goals>
-						<goal>jar</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-      <plugin>
-        <groupId>com.thoughtworks.paranamer</groupId>
-        <artifactId>paranamer-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-          <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-        </configuration>
-      </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>javadocs</id>
-                    <phase>test-compile</phase>
-                    <goals>
-                        <goal>copy-dependencies</goal>
-                    </goals>
-                    <configuration>
-                        <excludeTransitive>true</excludeTransitive>
-                        <classifier>javadoc</classifier>
-                        <includeGroupIds>net.sourceforge.f2j,${project.groupId}</includeGroupIds>
-                        <includeArtifactIds>arpack_combined_all,${project.artifactId}</includeArtifactIds>
-                        <failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
-                        <outputDirectory>${project.build.directory}/test-data</outputDirectory>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <Export-Package>com.thoughtworks.paranamer</Export-Package>
-            </instructions>
-          </configuration>
-        </plugin>
-        
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>com.thoughtworks.paranamer</groupId>
-                    <artifactId>paranamer-maven-plugin</artifactId>
-                    <versionRange>[2.4.1,)</versionRange>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/debian/rules b/debian/rules
index 9d21cd7..a365327 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,11 @@
 #!/usr/bin/make -f
-# export DH_VERBOSE=1
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar
 
-%:
-	dh $@ --parallel --with javahelper,jh_maven_repo_helper
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-override_dh_auto_build:
-	jh_build --javadoc paranamer-$(VER).jar com
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f paranamer-*.jar
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_BUILD_TARGET := install
+DEB_INSTALL_CHANGELOGS_ALL := README.md
 
 get-orig-source:
 	uscan --verbose --repack --compression xz --force-download
-
-get-orig-pom:
-	wget -O debian/pom.xml \
-	http://repo1.maven.org/maven2/com/thoughtworks/paranamer/paranamer/$(VER)/paranamer-$(VER).pom

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



More information about the pkg-java-commits mailing list