You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/12/29 16:10:11 UTC
svn commit: r1225553 - in /activemq/activemq-apollo/trunk: apollo-bdb/
apollo-broker/ apollo-cassandra/ apollo-cli/
apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/
apollo-hawtdb/ apollo-itests/ apollo-jdbm2/ apollo-leveldb/ apollo-openwi...
Author: chirino
Date: Thu Dec 29 15:10:10 2011
New Revision: 1225553
URL: http://svn.apache.org/viewvc?rev=1225553&view=rev
Log:
Revert "Revert "Remove the scala-compiler dependency from the poms.""
This reverts commit cfb623253defb1c3833ac9984c2970c550d813ab.
Modified:
activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
activemq/activemq-apollo/trunk/apollo-broker/pom.xml
activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
activemq/activemq-apollo/trunk/apollo-cli/pom.xml
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/BrokerService.scala
activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
activemq/activemq-apollo/trunk/apollo-itests/pom.xml
activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
activemq/activemq-apollo/trunk/apollo-scala/pom.xml
activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
activemq/activemq-apollo/trunk/apollo-util/pom.xml
activemq/activemq-apollo/trunk/apollo-web/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Thu Dec 29 15:10:10 2011
@@ -69,13 +69,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Thu Dec 29 15:10:10 2011
@@ -100,13 +100,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml Thu Dec 29 15:10:10 2011
@@ -65,13 +65,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Thu Dec 29 15:10:10 2011
@@ -45,13 +45,6 @@
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/BrokerService.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/BrokerService.scala?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/BrokerService.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/osgi/BrokerService.scala Thu Dec 29 15:10:10 2011
@@ -30,7 +30,6 @@ import org.apache.activemq.apollo.cli.co
import org.apache.felix.service.command.CommandSession
import java.io._
import java.lang.{UnsupportedOperationException, String}
-import tools.nsc.io.NullPrintStream
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml Thu Dec 29 15:10:10 2011
@@ -78,13 +78,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-itests/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/pom.xml Thu Dec 29 15:10:10 2011
@@ -48,13 +48,6 @@
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml Thu Dec 29 15:10:10 2011
@@ -74,13 +74,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml Thu Dec 29 15:10:10 2011
@@ -90,13 +90,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Thu Dec 29 15:10:10 2011
@@ -46,13 +46,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Thu Dec 29 15:10:10 2011
@@ -42,13 +42,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Thu Dec 29 15:10:10 2011
@@ -52,13 +52,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Thu Dec 29 15:10:10 2011
@@ -108,13 +108,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing Dependencies -->
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1225553&r1=1225552&r2=1225553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Thu Dec 29 15:10:10 2011
@@ -101,13 +101,6 @@
<scope>compile</scope>
<version>${scala-version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala-version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
<!-- Testing -->
<dependency>