[netty] 13/18: Build with maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Sep 12 22:20:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository netty.
commit 22d76f5385d2827e2af91ac5d7350f8e572f9e5a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Sep 12 23:07:08 2015 +0200
Build with maven-debian-helper
---
debian/README.Debian | 11 ---
debian/README.source | 31 +++----
debian/build.xml | 81 -----------------
debian/changelog | 4 +-
debian/control | 35 +++++---
debian/libnetty-java.lintian-overrides | 2 +
debian/libnetty-java.poms | 18 ++++
debian/maven.ignoreRules | 63 +++++++++----
debian/maven.properties | 5 ++
debian/maven.rules | 13 ++-
debian/patches/01-ignore-npn.patch | 63 +++++++++++++
debian/patches/02-ignore-enforcer-rules.patch | 24 +++++
debian/patches/03-ignore-jboss-marshalling.patch | 26 ++++++
debian/patches/04-netty-all-light.patch | 109 +++++++++++++++++++++++
debian/patches/series | 4 +
debian/rules | 21 ++---
16 files changed, 353 insertions(+), 157 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index e189a40..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,11 +0,0 @@
-Please note that in order to reduce dependencies, the Debian Netty package
-currently doesn't provide some optional Netty features:
-
- * XNIO support (org.jboss.netty.channel.xnio package)
- * JBoss microcontainer support (org.jboss.netty.container package)
- * Google Guice and Spring Framework support (org.jboss.netty.example package)
- * Protocol buffers support (org.jboss.netty.handler.codec.protobuf package)
- * JBoss Logging support (org.jboss.netty.logging.JBossLogger* classes)
- * OSGi Logging support (org.jboss.netty.logging.OsgiLogger* classes)
-
--- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 30 Jun 2009 11:11:15 +0200
diff --git a/debian/README.source b/debian/README.source
index 6f5e0f4..a8c1eb2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,23 +1,14 @@
-Building the source tarball
----------------------------
+Information about netty
+-----------------------
-Tarball is now built from the tagged source repository and requires no
-additional changes to meet DFSG.
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
- -- Chris Grzegorczyk <grze at eucalyptus.com> Thu, 17 Dec 2009 03:12:31 -0800
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
-The source tarball is repacked from the original source tarball downloaded
-from [1]. The doc/ subdirectory was removed, as it contains binary elements
-without source code (png, odg, pdf).
-
-[1] http://www.jboss.org/netty/downloads.html
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
-
-Test Suite Execution
---------------------
-
-The unit test suite has been enabled based on a) the features built from this
-source package and b) the version of easymock currently avaliable in the archive.
-
- -- James Page <james.page at ubuntu.com> Tue, 24 Jan 2012 09:02:56 +0000
+The netty-all.jar is intentionally empty to optimize the size
+of the package. It's pom depends on the other netty artifacts,
+such that using it in a Maven project is equivalent to the
+non empty version.
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 99581ca..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<project name="pkg-java" default="package" basedir="..">
-
- <property name="build.sourceDirectory" value="src/main/java"/>
- <property name="build.testSourceDirectory" value="src/test/java"/>
- <property name="build.directory" value="build"/>
- <property name="build.outputDirectory" value="${build.directory}/classes"/>
- <property name="build.testOutputDirectory" value="${build.directory}/test-classes"/>
- <property name="classpath.full.test" value="${build.testOutputDirectory}:${build.outputDirectory}"/>
- <property name="build.javaVersion" value="1.5"/>
-
- <target name="clean">
- <delete dir="${build.directory}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build.outputDirectory}"/>
- <javac
- destdir="${build.outputDirectory}"
- nowarn="true"
- source="${build.javaVersion}" target="${build.javaVersion}"
- deprecation="false"
- debug="on">
- <src path="${build.sourceDirectory}"/>
- <exclude name="org/jboss/netty/container/**"/>
- <exclude name="org/jboss/netty/example/**"/>
- <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
- <exclude name="org/jboss/netty/logging/JBossLogger*.java"/>
- <exclude name="org/jboss/netty/logging/OsgiLogger*.java"/>
- </javac>
- </target>
-
- <patternset id="test.sources.exclude">
- <exclude name="**/ChannelBuffersTest.java"/>
- <exclude name="**/JdkLoggerTest.java"/>
- <exclude name="**/InternalLoggerFactoryTest.java"/>
- <exclude name="**/Log4JLoggerTest.java"/>
- <exclude name="org/jboss/netty/logging/JBoss*.java"/>
- <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
- <exclude name="**/StackTraceSimplifierTest.java"/>
- <exclude name="org/jboss/netty/handler/ssl/**"/>
- <exclude name="**/SwitchableInputStreamTest.java"/>
- </patternset>
-
- <target name="test-compile">
- <mkdir dir="${build.testOutputDirectory}"/>
- <javac
- destdir="${build.testOutputDirectory}"
- classpath="${classpath.full.test}"
- nowarn="true"
- source="${build.javaVersion}" target="${build.javaVersion}"
- debug="on">
- <src path="${build.testSourceDirectory}"/>
- <patternset refid="test.sources.exclude"/>
- </javac>
- </target>
-
- <target name="test" depends="test-compile">
- <mkdir dir="${build.directory}/test-output"/>
- <junit printsummary="yes" haltonfailure="yes">
- <sysproperty key="basedir" value="${basedir}"/>
- <classpath>
- <pathelement path="${classpath.full.test}"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest todir="${build.directory}/test-output">
- <fileset dir="${build.testSourceDirectory}">
- <include name="**/*Test.java"/>
- <exclude name="**/Abstract*"/>
- <patternset refid="test.sources.exclude"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="package" depends="compile,test">
- <jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
- basedir="${build.outputDirectory}"/>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 505009c..a5b22f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-netty (1:3.2.6.Final-3) UNRELEASED; urgency=low
+netty (1:4.0.30-1) UNRELEASED; urgency=low
* Team upload.
[ Emmanuel Bourg ]
+ * New upstream release:
+ - Build with maven-debian-helper
* debian/control:
- Team maintenance by Debian Java Maintainers
- Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index 1d60c9d..5f3664c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,27 @@ Uploaders: Chris Grzegorczyk <grze at eucalyptus.com>,
Graziano Obertelli <graziano at eucalyptus.com>,
Kyo Lee <kyo.lee at eucalyptus.com>,
Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends-Indep: default-jdk,
- junit4,
- libcommons-logging-java,
- libeasymock-java,
- liblog4j1.2-java,
- libservlet2.5-java,
- libslf4j-java,
- maven-repo-helper
-Build-Depends: ant, ant-optional, cdbs (>= 0.4.5.3), debhelper (>= 9)
+Build-Depends: ant,
+ ant-contrib (>= 1.0~b3+svn177-7~),
+ cdbs,
+ debhelper (>= 9),
+ default-jdk,
+ ivy,
+ libasm4-java,
+ libbuild-helper-maven-plugin-java,
+ libbcel-java,
+ libbcpkix-java,
+ libjavassist-java,
+ libjzlib-java,
+ libmaven-antrun-plugin-java,
+ libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmaven-scm-java,
+ libmockito-java,
+ libnetty-tcnative-java,
+ libprotobuf-java,
+ libxz-java,
+ maven-debian-helper (>= 1.5)
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/netty.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/netty.git
@@ -23,9 +35,8 @@ Homepage: http://netty.io/
Package: libnetty-java
Architecture: all
-Depends: ${misc:Depends}
-Recommends: libcommons-logging-java | liblog4j1.2-java | libslf4j-java,
- libservlet2.5-java
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Java NIO client/server socket framework
Netty is a Java NIO client/server framework which enables quick and easy
development of network applications such as protocol servers and clients.
diff --git a/debian/libnetty-java.lintian-overrides b/debian/libnetty-java.lintian-overrides
new file mode 100644
index 0000000..7963db2
--- /dev/null
+++ b/debian/libnetty-java.lintian-overrides
@@ -0,0 +1,2 @@
+# netty-all.jar is intentionally empty but depends on the other netty artifacts
+libnetty-java: codeless-jar usr/share/java/netty-all.jar
diff --git a/debian/libnetty-java.poms b/debian/libnetty-java.poms
index 5ad70f2..41f7917 100644
--- a/debian/libnetty-java.poms
+++ b/debian/libnetty-java.poms
@@ -26,3 +26,21 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
+transport-native-epoll/pom.xml --ignore
+common/pom.xml --has-package-version
+buffer/pom.xml --has-package-version
+codec/pom.xml --has-package-version
+codec-haproxy/pom.xml --has-package-version
+codec-http/pom.xml --has-package-version
+codec-socks/pom.xml --has-package-version
+transport/pom.xml --has-package-version
+transport-rxtx/pom.xml --ignore
+transport-sctp/pom.xml --has-package-version
+transport-udt/pom.xml --ignore
+handler/pom.xml --has-package-version
+example/pom.xml --ignore
+testsuite/pom.xml --ignore
+testsuite-osgi/pom.xml --ignore
+microbench/pom.xml --ignore
+all/pom.xml --has-package-version
+tarball/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index dc4ab99..8f5f920 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,27 +14,58 @@
# from the POM
# junit junit jar s/3\\..*/3.x/
-# Packages excluded in debian/build.xml
-com.google.protobuf protobuf-java * * * *
-org.apache.felix org.osgi.compendium * * * *
-org.apache.felix org.osgi.core * * * *
-org.jboss.logging jboss-logging-spi * * * *
-
# Disable unneeded plugins
-org.apache.maven.plugins maven-assembly-plugin * * * *
-org.apache.maven.plugins maven-eclipse-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-clean-plugin * * * *
+org.apache.maven.plugins maven-dependency-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-failsafe-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-jxr-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
# No tests
-org.apache.maven.plugins maven-surefire-plugin * * * *
-junit junit * * * *
-org.easymock easymock * * * *
+ch.qos.logback logback-classic * * * *
+com.google.caliper caliper * * * *
+com.yammer.metrics metrics-core * * * *
+me.normanmaurer.maven.autobahntestsuite autobahntestsuite-maven-plugin * * * *
+org.apache.felix org.apache.felix.framework * * * *
org.easymock easymockclassextension * * * *
+org.jmock jmock-junit4 * * * *
+org.openjdk.jmh jmh-core * * * *
+org.openjdk.jmh jmh-generator-annprocess * * * *
+org.ops4j.pax.exam maven-paxexam-plugin * * * *
+org.ops4j.pax.exam pax-exam-container-native * * * *
+org.ops4j.pax.exam pax-exam-junit4 * * * *
+org.ops4j.pax.exam pax-exam-link-mvn * * * *
+org.ops4j.pax.exam pax-exam-spi * * * *
+org.ops4j.pax.exam pax-exam * * * *
+org.ops4j.pax.url pax-url-wrap * * * *
+org.osgi org.osgi.core * * * *
+
+# Native compilation disabled
+kr.motd.maven exec-maven-plugin * * * *
+kr.motd.maven os-maven-plugin * * * *
+org.fusesource.hawtjni maven-hawtjni-plugin * * * *
+
+# NPN/ALPN support disabled
+org.eclipse.jetty.alpn alpn-api * * * *
+org.eclipse.jetty.npn npn-api * * * *
+org.mortbay.jetty.alpn alpn-boot * * * *
+org.mortbay.jetty.npn npn-boot * * * *
+
+# JBoss Marshalling support disabled
+org.jboss.marshalling jboss-marshalling-river * * * *
+org.jboss.marshalling jboss-marshalling-serial * * * *
+org.jboss.marshalling jboss-marshalling * * * *
-# No docs
-org.jboss jbossorg-docbook-xslt * * * *
-org.jboss jbossorg-fonts * * * *
-org.jboss jbossorg-jdocbook-style * * * *
-org.jboss.maven.plugins maven-jdocbook-plugin * * * *
+# Missing modules referenced by netty-all
+io.netty netty-build * * * *
+io.netty netty-example * * * *
+io.netty netty-transport-native-epoll * * * *
+io.netty netty-transport-rxtx * * * *
+io.netty netty-transport-udt * * * *
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.rules b/debian/maven.rules
index bfede64..5f5d243 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,8 +16,17 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-org.jboss.netty netty bundle s/.*/debian/ * *
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
+s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+org.apache.maven.scm maven-scm-api jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+io.netty netty-tcnative * s/.*/debian/ s/.*// *
+s/jboss/javassist/ javassist * s/.*/debian/ * *
log4j log4j * s/1\.2\..*/1.2.x/ * *
+org.bouncycastle s/bcpkix-jdk15on/bcpkix/ * s/.*/debian/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+s/org.javassist/javassist/ * * s/.*/debian/ * *
+org.ow2.asm * * s/.*/4.x/ * *
+junit junit * s/.*/4.x/ * *
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
new file mode 100644
index 0000000..04dba73
--- /dev/null
+++ b/debian/patches/01-ignore-npn.patch
@@ -0,0 +1,63 @@
+Description: Disable the NPN/ALPN support since it relies on jetty npn-api and alpn-api which aren't available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -1038,6 +1038,7 @@
+ </dependencies>
+ </plugin>
+ <!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
++<!--
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+@@ -1067,6 +1068,7 @@
+ </execution>
+ </executions>
+ </plugin>
++-->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+--- a/handler/pom.xml
++++ b/handler/pom.xml
+@@ -78,5 +78,21 @@
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>**/*Alpn*.java</exclude>
++ <exclude>**/*Npn*.java</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++
+ </project>
+
+--- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
++++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
+@@ -223,6 +223,7 @@
+ switch(config.protocol()) {
+ case NONE:
+ return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
++/*
+ case ALPN:
+ if (isServer) {
+ switch(config.selectorFailureBehavior()) {
+@@ -267,6 +268,7 @@
+ .append(config.selectorFailureBehavior()).append(" failure behavior").toString());
+ }
+ }
++*/
+ default:
+ throw new UnsupportedOperationException(new StringBuilder("JDK provider does not support ")
+ .append(config.protocol()).append(" protocol").toString());
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
new file mode 100644
index 0000000..4ab7a29
--- /dev/null
+++ b/debian/patches/02-ignore-enforcer-rules.patch
@@ -0,0 +1,24 @@
+Description: Ignore the maven-enforcer-plugin (not needed)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -1288,18 +1288,6 @@
+
+ <pluginManagement>
+ <plugins>
+- <plugin>
+- <artifactId>maven-enforcer-plugin</artifactId>
+- <version>1.3.1</version>
+- <dependencies>
+- <!-- Provides the 'requireFilesContent' enforcer rule. -->
+- <dependency>
+- <groupId>com.ceilfors.maven.plugin</groupId>
+- <artifactId>enforcer-rules</artifactId>
+- <version>1.1.0</version>
+- </dependency>
+- </dependencies>
+- </plugin>
+ <!-- keep surefire and failsafe in sync -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
diff --git a/debian/patches/03-ignore-jboss-marshalling.patch b/debian/patches/03-ignore-jboss-marshalling.patch
new file mode 100644
index 0000000..29bf03f
--- /dev/null
+++ b/debian/patches/03-ignore-jboss-marshalling.patch
@@ -0,0 +1,26 @@
+Description: Disable the JBoss Marshalling support (not in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/codec/pom.xml
++++ b/codec/pom.xml
+@@ -62,5 +62,20 @@
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>**/marshalling/*.java</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++
+ </project>
+
diff --git a/debian/patches/04-netty-all-light.patch b/debian/patches/04-netty-all-light.patch
new file mode 100644
index 0000000..b28c25f
--- /dev/null
+++ b/debian/patches/04-netty-all-light.patch
@@ -0,0 +1,109 @@
+Description: Turn the netty-all jar into an empty jar to optimize the size of the package
+ but keep the dependencies on the other artifacts
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/all/pom.xml
++++ b/all/pom.xml
+@@ -110,84 +110,72 @@
+ <artifactId>netty-buffer</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-codec-haproxy</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-codec-socks</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-transport-rxtx</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-transport-sctp</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-transport-udt</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netty-example</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+- <optional>true</optional>
+ </dependency>
+
+ <!-- Add optional dependencies explicitly to avoid Javadoc warnings and errors. -->
+@@ -289,7 +277,7 @@
+ </execution>
+ <execution>
+ <id>merge-version-properties</id>
+- <phase>prepare-package</phase>
++ <phase>none</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+@@ -317,7 +305,7 @@
+ <!-- Clean everything once finished so that IDE doesn't find the unpacked files. -->
+ <execution>
+ <id>clean-source-directory</id>
+- <phase>package</phase>
++ <phase>none</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ba58eae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-ignore-npn.patch
+02-ignore-enforcer-rules.patch
+03-ignore-jboss-marshalling.patch
+04-netty-all-light.patch
diff --git a/debian/rules b/debian/rules
index 6afe4a5..b6d95b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,14 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
- -DartifactId=$(DEB_SOURCE_PACKAGE)
-DEB_JARS := commons-logging log4j-1.2 servlet-api-2.5 \
- slf4j-api slf4j-log4j12 junit4 easymock ant-junit4 ant-junit
+JAVA_HOME := /usr/lib/jvm/default-java
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
- mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java
- mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
-
-clean::
- mh_clean
+common-configure-indep::
+ # Create an empty manifest to workaround an issue with maven-jar-plugin
+ mkdir -p all/target/classes/META-INF/
+ touch all/target/classes/META-INF/MANIFEST.MF
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+ uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git
More information about the pkg-java-commits
mailing list