[activemq-protobuf] 04/05: Apply activemq-protobuf.diff and fix FTBFS with Java 9.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository activemq-protobuf.

commit 72a4ce6f5d894155dfc338c1aaae06b31a42afec
Author: Markus Koschany <apo at debian.org>
Date:   Tue Oct 24 18:19:22 2017 +0200

    Apply activemq-protobuf.diff and fix FTBFS with Java 9.
    
    Thanks: Chris West for the report and patch.
    Closes: #873205
---
 debian/patches/activemq-protobuf.diff | 79 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 80 insertions(+)

diff --git a/debian/patches/activemq-protobuf.diff b/debian/patches/activemq-protobuf.diff
new file mode 100644
index 0000000..dd2e196
--- /dev/null
+++ b/debian/patches/activemq-protobuf.diff
@@ -0,0 +1,79 @@
+commit 8b2b15557765acf38f228757a46b0e4dd02a008a
+Author: Chris West (Faux) <git at goeswhere.com>
+Date:   Mon Aug 21 18:20:05 2017 +0100
+
+    fix compilation on java 9
+
+     * Remove unused, invalid import.
+     * Bump source/target versions to something supported.
+     * Override compiler plugin version so it can parse modern compiler output.
+
+diff --git a/activemq-protobuf-test/pom.xml b/activemq-protobuf-test/pom.xml
+index 34d16c8..bae9fa2 100644
+--- a/activemq-protobuf-test/pom.xml
++++ b/activemq-protobuf-test/pom.xml
+@@ -58,8 +58,8 @@
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+         </configuration>
+       </plugin>
+       <plugin>
+diff --git a/activemq-protobuf/pom.xml b/activemq-protobuf/pom.xml
+index c32b76c..5a5355c 100644
+--- a/activemq-protobuf/pom.xml
++++ b/activemq-protobuf/pom.xml
+@@ -62,8 +62,8 @@
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+         </configuration>
+       </plugin>
+       <plugin>
+diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
+index c407b44..44ad091 100644
+--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
++++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
+@@ -22,8 +22,6 @@ import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
+
+-import com.sun.org.apache.bcel.internal.generic.BASTORE;
+-
+
+ public class MessageDescriptor implements TypeDescriptor {
+
+diff --git a/pom.xml b/pom.xml
+index e2ce7e7..cb02309 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -175,9 +175,10 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-compiler-plugin</artifactId>
++        <version>3.6.2</version>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.7</source>
++          <target>1.7</target>
+           <optimize>true</optimize>
+           <debug>true</debug>
+           <showDeprecation>true</showDeprecation>
+@@ -271,7 +272,7 @@
+           -->
+           <linksource>true</linksource>
+           <maxmemory>900m</maxmemory>
+-          <source>1.5</source>
++          <source>1.7</source>
+         </configuration>
+       </plugin>
+     </plugins>
diff --git a/debian/patches/series b/debian/patches/series
index 0465c01..fdde228 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 force_version_for_tests.diff
+activemq-protobuf.diff

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