odlparent/pom.xml: Parameter tasks is deprecated

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 5e10b3bbd7df49a38f9a1b4fb6b9bedb551f6d90..2222f84346fbc83e60e3e0d0ee5be0ccfd4b4ea7 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -175,7 +175,7 @@
       <dependency>
          <groupId>org.skyscreamer</groupId>
          <artifactId>jsonassert</artifactId>
-         <version>1.2.3</version>
+         <version>1.3.0</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -818,7 +818,7 @@
       <dependency>
         <groupId>com.webcohesion.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
-        <version>2.1.1</version>
+        <version>2.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
@@ -1169,6 +1169,39 @@
           <version>2.9.2</version>
       </dependency>
 
+      <!-- Annotations -->
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
+
+      <!-- Cassandra -->
+      <dependency>
+        <groupId>com.datastax.cassandra</groupId>
+        <artifactId>cassandra-driver-core</artifactId>
+        <version>2.1.9</version>
+      </dependency>
+
+      <!-- Metrics -->
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>3.1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-graphite</artifactId>
+        <version>3.1.2</version>
+      </dependency>
+
+      <!-- Karaf console support -->
+      <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <version>${karaf.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -1385,6 +1418,34 @@
         </plugin>
 
         <!-- Third-party plugins, grouped by groupId, alpha-sorted by artifactId -->
+        <plugin>
+          <!-- Support Blueprint XML construction using annotations -->
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>blueprint-maven-plugin</artifactId>
+          <version>1.4.0</version>
+          <configuration>
+            <scanPaths>
+              <scanPath>org.opendaylight</scanPath>
+            </scanPaths>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <!-- See https://issues.apache.org/jira/browse/ARIES-1596 -->
+              <!-- This shouldn't be necessary with plugin version 1.5.0 -->
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-finder-shaded</artifactId>
+              <version>4.5</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <goals>
+                <goal>blueprint-generate</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -1601,7 +1662,7 @@
                   <version>1.8.0</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
-                  <version>[3.2.5,)</version>
+                  <version>[3.3.9,)</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -1706,6 +1767,49 @@
            </dependency>
          </dependencies>
       </plugin>
+
+      <!-- Blueprint dependency injection -->
+      <!-- Remove when upgrading to plugin 1.5.0, and use
+           <configuration><generatedDir>org/opendaylight/blueprint/</...></...> -->
+      <!-- See https://issues.apache.org/jira/browse/ARIES-1597 -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!-- This should only run once, in the process-classes phase; but we need it to run after
+               process-classes in child projects. Attaching to process-test-classes and prepare-package
+               ensures that the file will be moved whether tests are skipped or not. -->
+          <execution>
+            <id>move-autowire-test</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                <move file="${basedir}/target/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                      todir="${basedir}/target/generated-resources/org/opendaylight/blueprint"
+                      failonerror="false" quiet="true" />
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>move-autowire-package</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                <move file="${basedir}/target/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                      todir="${basedir}/target/generated-resources/org/opendaylight/blueprint"
+                      failonerror="false" quiet="true" />
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>