Repository: activemq Updated Branches: refs/heads/trunk a20c3a07a -> bdb24ee7c
Fixes AMQ-5176: Support building ActiveMQ using Java 8 JDK Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bdb24ee7 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bdb24ee7 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bdb24ee7 Branch: refs/heads/trunk Commit: bdb24ee7c78aa037a085bc7ce90bd216a3a13d3d Parents: a20c3a0 Author: Hiram Chirino <[email protected]> Authored: Wed May 7 10:53:31 2014 -0400 Committer: Hiram Chirino <[email protected]> Committed: Wed May 7 10:53:51 2014 -0400 ---------------------------------------------------------------------- activemq-leveldb-store/pom.xml | 4 ++-- .../apache/activemq/leveldb/LevelDBStore.scala | 2 +- .../replicated/ElectingLevelDBStore.scala | 2 +- .../leveldb/replicated/MasterLevelDBStore.scala | 2 +- .../ReplicatedLevelDBStoreTrait.scala | 2 +- .../leveldb/replicated/SlaveLevelDBStore.scala | 2 +- .../replicated/groups/ClusteredSingleton.scala | 2 +- .../activemq/leveldb/dfs/DFSLevelDBStore.scala | 2 +- .../apache/activemq/partition/dto/Target.java | 3 +-- activemq-runtime-config/pom.xml | 21 ++++++++++++++++++++ .../DurableSubscriptionOffline1Test.java | 3 +-- .../activemq/config/ValidateXMLConfigTest.java | 3 +-- pom.xml | 6 +++--- 13 files changed, 36 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml index 6f68731..5cafb48 100644 --- a/activemq-leveldb-store/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>org.fusesource.hawtdispatch</groupId> - <artifactId>hawtdispatch-scala</artifactId> + <artifactId>hawtdispatch-scala-2.11</artifactId> <version>${hawtdispatch-version}</version> </dependency> <dependency> @@ -319,7 +319,7 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala-version}</artifactId> + <artifactId>scalatest_2.11</artifactId> <version>${scalatest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala index d1f8f6b..146269d 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala @@ -25,7 +25,7 @@ import java.io.File import java.io.IOException import java.util.concurrent._ import java.util.concurrent.atomic.AtomicLong -import reflect.BeanProperty +import beans.BeanProperty import org.apache.activemq.store._ import java.util._ import collection.mutable.ListBuffer http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala index 4ff4288..9a1852e 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala @@ -17,7 +17,7 @@ package org.apache.activemq.leveldb.replicated import org.linkedin.util.clock.Timespan -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import org.apache.activemq.util.ServiceStopper import org.apache.activemq.leveldb.{LevelDBClient, RecordLog, LevelDBStore} import java.net.{NetworkInterface, InetAddress} http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala index 6de5f63..00f16ba 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala @@ -27,7 +27,7 @@ import java.util.concurrent._ import java.io.{IOException, File} import java.net.{SocketAddress, InetSocketAddress, URI} import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong} -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import org.fusesource.hawtbuf.{Buffer, AsciiBuffer} class PositionSync(val position:Long, count:Int) extends CountDownLatch(count) http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala index 1c522aa..81efbf5 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreTrait.scala @@ -16,7 +16,7 @@ */ package org.apache.activemq.leveldb.replicated -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import java.util.UUID import org.apache.activemq.leveldb.LevelDBStore import org.apache.activemq.leveldb.util.FileSupport._ http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala index 2d288bd..5d66aba 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala @@ -28,7 +28,7 @@ import org.apache.activemq.leveldb.util._ import FileSupport._ import java.io.{IOException, RandomAccessFile, File} -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import java.util.concurrent.{CountDownLatch, TimeUnit} object SlaveLevelDBStore extends Log http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala index 8b02458..0a03811 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala @@ -24,7 +24,7 @@ import org.codehaus.jackson.map.ObjectMapper import collection.JavaConversions._ import java.util.LinkedHashMap import java.lang.{IllegalStateException, String} -import reflect.BeanProperty +import beans.BeanProperty import org.codehaus.jackson.annotate.JsonProperty import org.apache.zookeeper.KeeperException.NoNodeException http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBStore.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBStore.scala index effc058..4054512 100644 --- a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBStore.scala +++ b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/dfs/DFSLevelDBStore.scala @@ -20,7 +20,7 @@ package org.apache.activemq.leveldb.dfs import org.apache.hadoop.conf.Configuration import org.apache.activemq.util.ServiceStopper import org.apache.hadoop.fs.FileSystem -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import java.net.InetAddress import org.apache.activemq.leveldb.LevelDBStore http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java ---------------------------------------------------------------------- diff --git a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java index 2087f17..102f4ff 100644 --- a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java +++ b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java @@ -17,7 +17,6 @@ package org.apache.activemq.partition.dto; import org.codehaus.jackson.annotate.JsonProperty; -import scala.actors.threadpool.Arrays; import java.io.IOException; import java.util.Collection; @@ -37,7 +36,7 @@ public class Target { } public Target(String ...ids) { - this.ids.addAll(Arrays.asList(ids)); + this.ids.addAll(java.util.Arrays.asList(ids)); } @Override http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-runtime-config/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index 9a69ff1..f52d32c 100755 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -100,6 +100,27 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>set-system-properties</goal> + </goals> + <configuration> + <properties> + <property> + <name>javax.xml.accessExternalSchema</name> + <value>file</value> + </property> + </properties> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>${maven-dependency-plugin-version}</version> http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java index 67745f9..47fdac0 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java @@ -22,7 +22,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import scala.actors.threadpool.Arrays; import javax.jms.Connection; import javax.jms.Message; @@ -56,7 +55,7 @@ public class DurableSubscriptionOffline1Test extends DurableSubscriptionOfflineT List<Object[]> testParameters = new ArrayList<Object[]>(); Boolean[] booleanValues = {Boolean.FALSE, Boolean.TRUE}; - List<Boolean> booleans = Arrays.asList(booleanValues); + List<Boolean> booleans = java.util.Arrays.asList(booleanValues); for (Boolean booleanValue : booleans) { for (PersistenceAdapterChoice persistenceAdapterChoice : persistenceAdapterChoices) { Object[] currentChoice = {persistenceAdapterChoice, booleanValue}; http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java index 11accb0..438f0ee 100755 --- a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java +++ b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java @@ -33,7 +33,6 @@ import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import scala.actors.threadpool.Arrays; public class ValidateXMLConfigTest { @@ -51,7 +50,7 @@ public class ValidateXMLConfigTest { // resource:copy-resource brings all config files into target/conf File sampleConfDir = new File("target/conf"); - final HashSet<String> skipped = new HashSet<String>(Arrays.asList(new String[]{ + final HashSet<String> skipped = new HashSet<String>(java.util.Arrays.asList(new String[]{ "resin-web.xml", "web.xml" })); http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4cd4649..3d77054 100755 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ <geronimo-version>1.0</geronimo-version> <hadoop-version>1.0.0</hadoop-version> <hawtbuf-version>1.10</hawtbuf-version> - <hawtdispatch-version>1.20</hawtdispatch-version> + <hawtdispatch-version>1.21-SNAPSHOT</hawtdispatch-version> <howl-version>0.1.8</howl-version> <hsqldb-version>1.8.0.12</hsqldb-version> <httpclient-version>4.2.5</httpclient-version> @@ -107,10 +107,10 @@ <saxon-version>9.5.1-2</saxon-version> <saxon-bundle-version>9.5.1-1_1</saxon-bundle-version> <scala-plugin-version>3.1.0</scala-plugin-version> - <scala-version>2.9.1</scala-version> + <scala-version>2.11.0</scala-version> <scala-bundle-version>2.9.1_3</scala-bundle-version> <shiro-version>1.2.2</shiro-version> - <scalatest-version>1.8</scalatest-version> + <scalatest-version>2.1.5</scalatest-version> <slf4j-version>1.7.5</slf4j-version> <snappy-version>1.1.0.1</snappy-version> <spring-version>3.2.8.RELEASE</spring-version>
