akka-testkit should be scoped to test

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f9b66aafdd900c06dd7e15e58fea2227cb044f7b..f90b09f939c91ee2a7d86c80d9bd4c6646e4a044 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -116,7 +116,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.4</akka.version>
+    <akka.version>2.4.7</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>8</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
@@ -194,6 +194,12 @@
         <version>1.3</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>1.3</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-mockito</artifactId>
@@ -276,6 +282,12 @@
         <artifactId>guava</artifactId>
         <version>18.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>18.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
@@ -975,6 +987,7 @@
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-testkit_${scala.version}</artifactId>
         <version>${akka.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
@@ -1118,6 +1131,29 @@
         <artifactId>org.apache.aries.blueprint.core</artifactId>
         <version>1.4.2</version>
       </dependency>
+
+      <!-- Xtend http://xtend-lang.org
+           NOTE: When you increase the version here,
+           then remember to also increase it for the
+           xtend-maven-plugin below! (We don't want to
+           use a Maven property, in order not to "leak" that.)
+       -->
+      <dependency>
+          <groupId>org.eclipse.xtend</groupId>
+          <artifactId>org.eclipse.xtend.lib</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.xtend</groupId>
+          <artifactId>org.eclipse.xtend.lib.macro</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.xtext</groupId>
+          <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -1333,7 +1369,24 @@
           <artifactId>properties-maven-plugin</artifactId>
           <version>${propertymavenplugin.version}</version>
         </plugin>
-
+        <plugin>
+          <groupId>org.eclipse.xtend</groupId>
+          <artifactId>xtend-maven-plugin</artifactId>
+          <!-- NOTE: This version MUST be kept in sync with the Xtend version in <dependencyManagement> -->
+          <version>2.9.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+                <goal>testCompile</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}/generated-sources/xtend/main</outputDirectory>
+                <testOutputDirectory>${project.build.directory}/generated-sources/xtend/test</testOutputDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
@@ -1458,6 +1511,9 @@
             <id>enforce-maven</id>
             <configuration>
               <rules>
+                <requireJavaVersion>
+                  <version>1.8.0</version>
+                </requireJavaVersion>
                 <requireMavenVersion>
                   <version>3.1.1</version>
                 </requireMavenVersion>