You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/08/23 19:05:41 UTC
activemq-protobuf git commit: AMQ-6795 Apply patch to allow build on
JDK 9
Repository: activemq-protobuf
Updated Branches:
refs/heads/trunk d563d052b -> 3a22cd72d
AMQ-6795 Apply patch to allow build on JDK 9
Apply patch to allow JDK 9 builds
Project: http://git-wip-us.apache.org/repos/asf/activemq-protobuf/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-protobuf/commit/3a22cd72
Tree: http://git-wip-us.apache.org/repos/asf/activemq-protobuf/tree/3a22cd72
Diff: http://git-wip-us.apache.org/repos/asf/activemq-protobuf/diff/3a22cd72
Branch: refs/heads/trunk
Commit: 3a22cd72dc5344451500dbd376403d1dbd843bb6
Parents: d563d05
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Aug 23 15:05:28 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Aug 23 15:05:28 2017 -0400
----------------------------------------------------------------------
.gitignore | 33 ++++++++++++++++++++
activemq-protobuf-test/pom.xml | 4 +--
activemq-protobuf/pom.xml | 4 +--
.../protobuf/compiler/MessageDescriptor.java | 2 --
pom.xml | 7 +++--
5 files changed, 41 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-protobuf/blob/3a22cd72/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4fd3911
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+*~
+*.swp
+.idea
+.idea/*
+*.iml
+*.ipr
+*.iws
+target
+.DS_Store
+.project
+.classpath
+.settings
+eclipse-classes
+activemq-unit-tests/ActiveMQConnections.dot
+activemq-unit-tests/KahaDB
+activemq-unit-tests/broker
+activemq-unit-tests/derby.log
+activemq-unit-tests/derbyDb
+activemq-unit-tests/LevelDB
+activemq-unit-tests/networkedBroker
+activemq-unit-tests/shared
+activemq-data
+activemq-leveldb-store/.cache
+activemq-leveldb-store/.cache-main
+activemq-leveldb-store/.cache-tests
+activemq-leveldb-store/.tmpBin
+activemq-runtime-config/src/main/resources/activemq.xsd
+activemq-amqp/amqp-trace.txt
+data/
+dependency-reduced-pom.xml
+velocity.log
+
+/.metadata
http://git-wip-us.apache.org/repos/asf/activemq-protobuf/blob/3a22cd72/activemq-protobuf-test/pom.xml
----------------------------------------------------------------------
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>
http://git-wip-us.apache.org/repos/asf/activemq-protobuf/blob/3a22cd72/activemq-protobuf/pom.xml
----------------------------------------------------------------------
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>
http://git-wip-us.apache.org/repos/asf/activemq-protobuf/blob/3a22cd72/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
----------------------------------------------------------------------
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 {
http://git-wip-us.apache.org/repos/asf/activemq-protobuf/blob/3a22cd72/pom.xml
----------------------------------------------------------------------
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>