[netty] 02/07: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jan 16 08:18:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository netty.
commit 1deea63cbcf38f8a1949c0432852c25eac3d7ab1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jan 16 08:56:12 2017 +0100
Refreshed the patches
---
debian/changelog | 8 ++
debian/patches/01-ignore-npn.patch | 8 +-
debian/patches/02-ignore-enforcer-rules.patch | 2 +-
debian/patches/03-ignore-jboss-marshalling.patch | 2 +-
debian/patches/04-netty-all-light.patch | 89 +---------------------
.../05-reproducible-versions-properties.patch | 2 +-
debian/patches/06-remove-tcnative-classifier.patch | 2 +-
debian/patches/07-netty-all-epoll-dependency.patch | 4 +-
8 files changed, 20 insertions(+), 97 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 604fae8..3173ee5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netty (1:4.1.7-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 16 Jan 2017 02:08:28 +0100
+
netty (1:4.0.42-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index c420b29..ca58c08 100644
--- a/debian/patches/01-ignore-npn.patch
+++ b/debian/patches/01-ignore-npn.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -729,6 +729,7 @@
+@@ -822,6 +822,7 @@
</configuration>
</plugin>
<!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
@@ -11,7 +11,7 @@ Forwarded: not-needed
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
-@@ -746,6 +747,7 @@
+@@ -839,6 +840,7 @@
</execution>
</executions>
</plugin>
@@ -45,7 +45,7 @@ Forwarded: not-needed
--- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
-@@ -270,6 +270,7 @@
+@@ -266,6 +266,7 @@
switch(config.protocol()) {
case NONE:
return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
@@ -53,7 +53,7 @@ Forwarded: not-needed
case ALPN:
if (isServer) {
switch(config.selectorFailureBehavior()) {
-@@ -314,6 +315,7 @@
+@@ -310,6 +311,7 @@
.append(config.selectorFailureBehavior()).append(" failure behavior").toString());
}
}
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index 7e3e9cb..1533d86 100644
--- a/debian/patches/02-ignore-enforcer-rules.patch
+++ b/debian/patches/02-ignore-enforcer-rules.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -1002,18 +1002,6 @@
+@@ -1095,18 +1095,6 @@
<pluginManagement>
<plugins>
diff --git a/debian/patches/03-ignore-jboss-marshalling.patch b/debian/patches/03-ignore-jboss-marshalling.patch
index 29bf03f..98dab95 100644
--- a/debian/patches/03-ignore-jboss-marshalling.patch
+++ b/debian/patches/03-ignore-jboss-marshalling.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/codec/pom.xml
+++ b/codec/pom.xml
-@@ -62,5 +62,20 @@
+@@ -89,5 +89,20 @@
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/debian/patches/04-netty-all-light.patch b/debian/patches/04-netty-all-light.patch
index 2b5d058..7a2c39e 100644
--- a/debian/patches/04-netty-all-light.patch
+++ b/debian/patches/04-netty-all-light.patch
@@ -4,92 +4,7 @@ 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. -->
-@@ -291,7 +279,7 @@
+@@ -435,7 +435,7 @@
</execution>
<execution>
<id>merge-version-properties</id>
@@ -98,7 +13,7 @@ Forwarded: not-needed
<goals>
<goal>run</goal>
</goals>
-@@ -319,7 +307,7 @@
+@@ -463,7 +463,7 @@
<!-- Clean everything once finished so that IDE doesn't find the unpacked files. -->
<execution>
<id>clean-source-directory</id>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index e4b8173..7574631 100644
--- a/debian/patches/05-reproducible-versions-properties.patch
+++ b/debian/patches/05-reproducible-versions-properties.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -964,11 +964,11 @@
+@@ -1057,11 +1057,11 @@
<propertyfile file="${versionPropFile}" comment="Generated by netty-parent/pom.xml">
<entry key="${project.artifactId}.version" value="${project.version}" />
diff --git a/debian/patches/06-remove-tcnative-classifier.patch b/debian/patches/06-remove-tcnative-classifier.patch
index 5fc9a11..a19453a 100644
--- a/debian/patches/06-remove-tcnative-classifier.patch
+++ b/debian/patches/06-remove-tcnative-classifier.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -298,7 +298,6 @@
+@@ -335,7 +335,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>${tcnative.artifactId}</artifactId>
<version>${tcnative.version}</version>
diff --git a/debian/patches/07-netty-all-epoll-dependency.patch b/debian/patches/07-netty-all-epoll-dependency.patch
index 702956d..9dc40b5 100644
--- a/debian/patches/07-netty-all-epoll-dependency.patch
+++ b/debian/patches/07-netty-all-epoll-dependency.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/all/pom.xml
+++ b/all/pom.xml
-@@ -81,25 +81,6 @@
+@@ -162,25 +162,6 @@
</plugins>
</build>
</profile>
@@ -30,7 +30,7 @@ Forwarded: not-needed
</profiles>
<dependencies>
-@@ -107,6 +88,12 @@
+@@ -188,6 +169,12 @@
<!-- All release modules -->
<dependency>
<groupId>${project.groupId}</groupId>
--
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