[jmdns] 09/10: Build with maven-debian-helper instead of jh_build

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jul 8 09:39:41 UTC 2016


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

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

commit cebee2fb6750ef7e6dcf596da7cfc0183399d458
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 8 11:30:00 2016 +0200

    Build with maven-debian-helper instead of jh_build
---
 debian/changelog                  |   4 +-
 debian/control                    |  13 +-
 debian/javabuild                  |   1 -
 debian/libjmdns-java-doc.doc-base |   6 +-
 debian/libjmdns-java-doc.docs     |   3 -
 debian/libjmdns-java-doc.install  |   1 +
 debian/libjmdns-java-doc.javadoc  |   4 -
 debian/libjmdns-java.install      |   1 -
 debian/libjmdns-java.jlibs        |   1 -
 debian/libjmdns-java.manifest     |   3 -
 debian/libjmdns-java.poms         |  29 ++-
 debian/maven.ignoreRules          |   7 +
 debian/maven.rules                |   2 +
 debian/patches/javaDocLink        |  10 -
 debian/poms/jmdns.pom             | 529 --------------------------------------
 debian/rules                      |  20 +-
 16 files changed, 55 insertions(+), 579 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a21b765..8e5a8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-jmdns (3.4.1-3) UNRELEASED; urgency=medium
+jmdns (3.4.2-1) UNRELEASED; urgency=medium
 
   [ Mathieu Malaterre ]
   * Remove self from Uploaders
 
   [ Emmanuel Bourg ]
+  * New upstream release
+    - Build with maven-debian-helper instead of jh_build
   * Track and download the releases from GitHub
   * Standards-Version updated to 3.9.8
   * Removed the deprecated DM-Upload-Allowed field
diff --git a/debian/control b/debian/control
index 1f2b0d8..d740645 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,14 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
-Build-Depends: debhelper (>= 9), javahelper, gcj-jdk, default-jdk, maven-repo-helper
-Build-Depends-Indep: junit4, libeasymock-java, ant
+Build-Depends:
+ debhelper (>= 9),
+ default-jdk,
+ junit4,
+ libeasymock-java,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jmdns.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jmdns.git
@@ -12,7 +18,8 @@ Homepage: https://github.com/jmdns/jmdns
 
 Package: libjmdns-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Java implementation of multi-cast DNS (Apple Rendezvous)
  JmDNS is a Java implementation of the IETF draft RFP multicast extensions for
  DNS.
diff --git a/debian/javabuild b/debian/javabuild
deleted file mode 100644
index 3998922..0000000
--- a/debian/javabuild
+++ /dev/null
@@ -1 +0,0 @@
-jmdns.jar src
diff --git a/debian/libjmdns-java-doc.doc-base b/debian/libjmdns-java-doc.doc-base
index 02218e6..9660182 100644
--- a/debian/libjmdns-java-doc.doc-base
+++ b/debian/libjmdns-java-doc.doc-base
@@ -1,9 +1,9 @@
 Document: libjmdns-java
 Title: API JavaDoc for libjmdns-java
 Author: Arthur van Hoff <avh at strangeberry.com>, Rick Blair <rickblair at mac.com>
-Abstract: This the API JavaDoc provided by Arthur van Hoff and Rick Blair for libjmdns-java
+Abstract: This the API JavaDoc for libjmdns-java
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjmdns-java-doc/api/
-Files: /usr/share/doc/libjmdns-java-doc/api/*.html
+Index: /usr/share/doc/libjmdns-java/api/
+Files: /usr/share/doc/libjmdns-java/api/*.html
diff --git a/debian/libjmdns-java-doc.docs b/debian/libjmdns-java-doc.docs
deleted file mode 100644
index bff1fa2..0000000
--- a/debian/libjmdns-java-doc.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NOTICE.txt
-docs/*.html
-docs/*.css
diff --git a/debian/libjmdns-java-doc.install b/debian/libjmdns-java-doc.install
new file mode 100644
index 0000000..63cbc5d
--- /dev/null
+++ b/debian/libjmdns-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libjmdns-java/api/
diff --git a/debian/libjmdns-java-doc.javadoc b/debian/libjmdns-java-doc.javadoc
deleted file mode 100644
index e5184ef..0000000
--- a/debian/libjmdns-java-doc.javadoc
+++ /dev/null
@@ -1,4 +0,0 @@
-com.strangeberry.jmdns.tools
-javax.jmdns
-javax.jmdns.impl
-javax.jmdns.impl.tasks
diff --git a/debian/libjmdns-java.install b/debian/libjmdns-java.install
deleted file mode 100644
index 565fa0e..0000000
--- a/debian/libjmdns-java.install
+++ /dev/null
@@ -1 +0,0 @@
-jmdns.jar      usr/share/java
diff --git a/debian/libjmdns-java.jlibs b/debian/libjmdns-java.jlibs
deleted file mode 100644
index fd65e3b..0000000
--- a/debian/libjmdns-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-jmdns.jar
diff --git a/debian/libjmdns-java.manifest b/debian/libjmdns-java.manifest
deleted file mode 100644
index ca1207a..0000000
--- a/debian/libjmdns-java.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/java/jmdns.jar:
- Main-Class: com.strangeberry.jmdns.tools.Main
- Debian-Java-Home: /usr/lib/jvm/default-java
diff --git a/debian/libjmdns-java.poms b/debian/libjmdns-java.poms
index 4099670..5ad70f2 100644
--- a/debian/libjmdns-java.poms
+++ b/debian/libjmdns-java.poms
@@ -1 +1,28 @@
-debian/poms/jmdns.pom --no-parent
+# 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
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..3c1f172
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,7 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.eclipse.m2e lifecycle-mapping * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..e85291e
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+junit junit jar s/4\..*/4.x/ * *
diff --git a/debian/patches/javaDocLink b/debian/patches/javaDocLink
deleted file mode 100644
index 39bd5a2..0000000
--- a/debian/patches/javaDocLink
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -71,6 +71,7 @@
-        version="true"
-        header="JmDNS ${version}"
-        windowtitle="JmDNS">
-+      <link href="/usr/share/doc/default-jdk-doc/api/" />
-       <fileset dir="${src}" defaultexcludes="yes">
-         <include name="javax/**/*.java"/>
-         <include name="com/**/*.java"/>
diff --git a/debian/poms/jmdns.pom b/debian/poms/jmdns.pom
deleted file mode 100644
index dab6a24..0000000
--- a/debian/poms/jmdns.pom
+++ /dev/null
@@ -1,529 +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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>javax.jmdns</groupId>
-	<artifactId>jmdns</artifactId>
-	<version>3.4.1</version>
-	<name>JmDNS</name>
-	<packaging>jar</packaging>
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-		<relativePath>.../parent/pom.xml</relativePath>
-		<!-- https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide -->
-		<!-- http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/ -->
-		<!-- mvn release:clean -->
-		<!-- mvn release:prepare -->
-		<!-- mvn release:perform -->
-		<!-- mvn nexus:staging-close -->
-		<!-- mvn nexus:staging-promote -->
-	</parent>
-	<description>JmDNS is a Java implementation of multi-cast DNS and can be used for service registration and discovery in local area networks. JmDNS is fully compatible with Apple's Bonjour.
-The project was originally started in December 2002 by Arthur van Hoff at Strangeberry. In November 2003 the project was moved to SourceForge, and the name was changed from JRendezvous to JmDNS for legal reasons.
-Many thanks to Stuart Cheshire for help and moral support.</description>
-	<url>http://sourceforge.net/projects/jmdns/</url>
-	<inceptionYear>2002</inceptionYear>
-	<organization>
-		<name>JmDNS</name>
-		<url>http://jmdns.sourceforge.net/</url>
-	</organization>
-	<scm>
-		<connection>scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1</connection>
-		<developerConnection>scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1</developerConnection>
-		<url>scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1</url>
-	</scm>
-	<distributionManagement>
-		<site>
-			<id>jmdns.sf.net</id>
-			<url>scp://shell.sourceforge.net/home/project-web/jmdns/htdocs</url>
-			<!-- http://maven.apache.org/plugins/maven-site-plugin/examples/site-deploy-to-sourceforge.net.html -->
-		</site>
-	</distributionManagement>
-	<issueManagement>
-		<system>sourceforge</system>
-		<url>http://sourceforge.net/tracker/?group_id=93852</url>
-	</issueManagement>
-	<mailingLists>
-		<mailingList>
-			<name>JmDNS Announce Mailing list</name>
-			<subscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-announce</subscribe>
-			<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-announce</unsubscribe>
-			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=jmdns-announce</archive>
-			<post>jmdns-announce at lists.sourceforge.net</post>
-		</mailingList>
-		<mailingList>
-			<name>JmDNS User Mailing list</name>
-			<subscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-discuss</subscribe>
-			<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-discuss</unsubscribe>
-			<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=jmdns-discuss</archive>
-			<post>jmdns-discuss at lists.sourceforge.net</post>
-		</mailingList>
-	</mailingLists>
-	<developers>
-		<developer>
-			<id>javanator</id>
-			<name>Arthur van Hoff</name>
-			<email>javanator at users.sourceforge.net</email>
-			<roles>
-				<role>Creator</role>
-			</roles>
-		</developer>
-		<developer>
-			<id>rickblair</id>
-			<name>Rich Blair</name>
-			<email>rickblair at users.sourceforge.net</email>
-			<roles>
-				<role>Administrator</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>-9</timezone>
-		</developer>
-		<developer>
-			<id>spearway</id>
-			<name>Pierre Frisch</name>
-			<email>spearway at users.sourceforge.net</email>
-			<url>http://www.spearway.com</url>
-			<organization>sPearWay Ltd.</organization>
-			<organizationUrl>http://www.spearway.com</organizationUrl>
-			<roles>
-				<role>Architect</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>-9</timezone>
-		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<name>Melloware</name>
-			<email>info at melloware.com</email>
-			<url>http://www.melloware.com</url>
-			<organization>Melloware Tean</organization>
-			<organizationUrl>http://www.melloware.com</organizationUrl>
-			<roles>
-				<role>Maven Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Scott Lewis</name>
-			<email>slewis at users.sourceforge.net</email>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Werner Randelshofer</name>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Jeff Sonstein</name>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Cédrik Lime</name>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Markus Alexander Kuppe</name>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-		<contributor>
-			<name>Jason LeBrun</name>
-			<roles>
-				<role>Contributor</role>
-			</roles>
-		</contributor>
-	</contributors>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<distribution>repo</distribution>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<type>jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.0</version>
-			<type>jar</type>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>${jvm.version}</source>
-					<target>${jvm.version}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<revisionOnScmFailure>true</revisionOnScmFailure>
-				</configuration>
-			</plugin>
-			<plugin>
-				<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-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<attach>true</attach>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<archive>
-						<addMavenDescriptor />
-						<compress />
-						<forced>true</forced>
-						<index>true</index>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-						<manifest>
-							<mainClass>javax.jmdns.impl.JmDNSImpl</mainClass>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-Build>${buildNumber}</Implementation-Build>
-							<Implementation-Date>${maven.build.timestamp}</Implementation-Date>
-						</manifestEntries>
-					</archive>
-					<excludes>
-						<!-- This fixes a bug in clover where it writes some instrumentation files where it should not JIAR: Clover/CLOV-943 -->
-						<exclude>groverconfig*/*.ser</exclude>
-						<exclude>groverconfig*</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.3.5</version>
-				<extensions>true</extensions>
-				<configuration>
-					<manifestLocation>${project.build.outputDirectory}/META-INF</manifestLocation>
-					<instructions>
-						<Export-Package>javax.jmdns</Export-Package>
-						<Private-Package>javax.jmdns.impl,javax.jmdns.impl.*,com.strangeberry.*,samples</Private-Package>
-						<Import-Package>!javax.swing.*</Import-Package>
-						<Bundle-RequiredExecutionEnvironment>JavaSE-${jvm.version}</Bundle-RequiredExecutionEnvironment>
-						<Bundle-Vendor>jmdns.sourceforge.net</Bundle-Vendor>
-					</instructions>
-				</configuration>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-      					<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<locales>en</locales>
-					<!--<templateFile>src/site/site.vm</templateFile> -->
-				</configuration>
-				<dependencies>
-					<dependency><!-- add support for ssh/scp -->
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-ssh</artifactId>
-						<version>1.0</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>com.atlassian.maven.plugins</groupId>
-				<artifactId>maven-clover2-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<includes>
-						<include>javax/**/*.java</include>
-					</includes>
-					<excludes>
-						<exclude>com/**/tools/*.java</exclude>
-						<exclude>samples/*.java</exclude>
-					</excludes>
-					<licenseLocation>clover.license.txt</licenseLocation>
-					<contextFilters>try,static</contextFilters>
-					<flushPolicy>threaded</flushPolicy>
-					<flushInterval>5000</flushInterval>
-					<includesTestSourceRoots>true</includesTestSourceRoots>
-					<generatePdf>false</generatePdf>
-					<generateXml>true</generateXml>
-					<generateHtml>true</generateHtml>
-					<targetPercentage>70%</targetPercentage>
-					<failOnViolation>false</failOnViolation>
-					<fullRunEvery>1</fullRunEvery>
-				</configuration>
-				<executions>
-					<execution>
-						<id>site</id>
-						<phase>pre-site</phase>
-						<goals>
-							<goal>instrument</goal>
-							<goal>aggregate</goal>
-							<goal>clover</goal>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<tagBase>https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/</tagBase>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-maven-plugin</artifactId>
-				<version>1.9.2.1</version>
-				<!-- mvn nexus:staging-close -->
-				<!-- mvn nexus:staging-list -->
-				<!-- mvn nexus:staging-drop -->
-				<!-- mvn nexus:staging-promote -->
-			</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>org.apache.felix</groupId>
-										<artifactId>maven-bundle-plugin</artifactId>
-										<versionRange>[2.1.0,)</versionRange>
-										<goals>
-											<goal>manifest</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<reporting>
-		<outputDirectory>target/site</outputDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<linkJavadoc>true</linkJavadoc>
-					<includes>
-						<include>javax/**/*.java</include>
-					</includes>
-					<excludes>
-						<exclude>com/**/tools/*.java</exclude>
-						<exclude>samples/*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.atlassian.maven.plugins</groupId>
-				<artifactId>maven-clover2-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<licenseLocation>clover.license.txt</licenseLocation>
-					<generatePdf>false</generatePdf>
-					<generateXml>true</generateXml>
-					<generateHtml>true</generateHtml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<configLocation>${basedir}/checkstyle.xml</configLocation>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-				<version>2.0-beta-2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<version>2.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<links>
-						<link>http://download.oracle.com/javase/6/docs/api/</link>
-						<link>http://logging.apache.org/log4j/1.2/apidocs/</link>
-						<link>http://junit.sourceforge.net/javadoc/</link>
-					</links>
-					<excludes>
-						<exclude>com/**/tools/*.java</exclude>
-						<exclude>samples/*.java</exclude>
-					</excludes>
-					<!-- additionalJOption>-J-Xmx512m</additionalJOption -->
-					<splitindex>true</splitindex>
-					<quiet />
-					<use>true</use>
-					<author>true</author>
-					<version>true</version>
-					<show>protected</show>
-					<keywords>true</keywords>
-					<verbose>true</verbose>
-					<locale>en_US</locale>
-					<maxmemory>512</maxmemory>
-					<encoding>UTF-8</encoding>
-					<docencoding>UTF-8</docencoding>
-					<windowtitle>JmDNS ${project.version} Reference</windowtitle>
-					<header><![CDATA[JmDNS ${project.version}]]></header>
-					<footer><![CDATA[<i>Last updated ${maven.build.timestamp}</i>]]></footer>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<rulesets>
-						<ruleset>/rulesets/basic.xml</ruleset>
-						<ruleset>/rulesets/imports.xml</ruleset>
-						<ruleset>/rulesets/unusedcode.xml</ruleset>
-						<ruleset>/rulesets/finalizers.xml</ruleset>
-						<ruleset>/rulesets/logging-jakarta-commons.xml</ruleset>
-						<ruleset>/rulesets/logging-java.xml</ruleset>
-						<ruleset>/rulesets/migrating_to_15.xml</ruleset>
-						<ruleset>/rulesets/design.xml</ruleset>
-						<ruleset>/rulesets/strings.xml</ruleset>
-					</rulesets>
-					<minimumTokens>150</minimumTokens>
-					<linkXref>true</linkXref>
-					<sourceEncoding>utf-8</sourceEncoding>
-					<targetJdk>${jvm.version}</targetJdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<tagListOptions>
-						<tagClasses>
-							<tagClass>
-								<displayName>To do</displayName>
-								<tags>
-									<tag>
-										<matchString>todo</matchString>
-										<matchType>ignoreCase</matchType>
-									</tag>
-								</tags>
-							</tagClass>
-							<tagClass>
-								<displayName>To be fixed</displayName>
-								<tags>
-									<tag>
-										<matchString>FIXME</matchString>
-										<matchType>ignoreCase</matchType>
-									</tag>
-								</tags>
-							</tagClass>
-						</tagClasses>
-					</tagListOptions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changes-plugin</artifactId>
-				<version>2.3</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>changes-report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-				<configuration>
-					<issueLinkTemplatePerSystem>
-						<sourceforge>http://sourceforge.net/support/tracker.php?aid=%ISSUE%</sourceforge>
-					</issueLinkTemplatePerSystem>
-					<publishDateFormat>yyyy-MM-dd HH:mm</publishDateFormat>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<properties>
-		<organization.logo>http://mirrorbrain.org/static/images/misc/sourceforge-logo.png</organization.logo>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-		<jvm.version>1.6</jvm.version>
-	</properties>
-</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index f35ed2f..9e49cc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,7 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/junit4.jar:/usr/share/java/easymock.jar
-
-VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
-PACKAGE = jmdns
 
 %:
-	dh $@ --with javahelper
-
-override_dh_auto_build:
-	:
-
-override_jh_build:
-	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5"
-
-override_dh_install:
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom $(PACKAGE).jar 
-	dh_javadoc -Nlibjmdns-java -plib$(PACKAGE)-java-doc -i --sourcedir=src 
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename --repack --compression xz

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



More information about the pkg-java-commits mailing list