Merge "Simple changes to eliminate pmd warnings"

[controller.git] / opendaylight / clustering / services_implementation / pom.xml

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index 6edb50b82efe93b5cbf2a9c3ae1804e1da4bd90c..d6bd287434a499c19b1aa1576b0aa11ee303344d 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -7,6 +7,11 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 
   <artifactId>clustering.services-implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
@@ -25,80 +30,83 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.5.3.201107060350</version>
+          <version>${jacoco.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-              org.slf4j,
-              !org.jboss.*,
-              !bsh*,
-              !net.jcip.*,
-              javax.transaction,
-              *,
-              org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.sal.core
-            </Import-Package>
-            <Bundle-Activator>
-              org.opendaylight.controller.clustering.services_implementation.internal.Activator
-            </Bundle-Activator>
-            <!-- Add in the DynamicImport-Package ONLY the packages that -->
-            <!-- contains types that MUST be unmarshalled by the -->
-            <!-- infinispan. They need to be wired at runtime even during -->
-            <!-- the bundle is already RESOLVED, but at the same time if -->
-            <!-- those are missing the bundle will still come up, this is -->
-            <!-- why those dependencies ends in the DynamicImport-Package -->
-            <!-- rather in the Import-Package  -->
-            <DynamicImport-Package>
-              *
-            </DynamicImport-Package>
-            <Embed-Dependency>
-              infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false
-            </Embed-Dependency>
-            <Embed-Transitive>
-              true
-            </Embed-Transitive>
-         </instructions>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <version>2.3.6</version>
+      <extensions>true</extensions>
+      <configuration>
+        <instructions>
+          <Import-Package>
+            org.slf4j,
+            !org.apache.logging.log4j.*,
+            !bsh*,
+            !net.jcip.*,
+            !javax.swing,
+            !org.hornetq.*,
+            !org.jboss.*,
+            javax.transaction,
+            *,
+            org.opendaylight.controller.clustering.services,
+            org.opendaylight.controller.sal.core
+          </Import-Package>
+          <Bundle-Activator>
+            org.opendaylight.controller.clustering.services_implementation.internal.Activator
+          </Bundle-Activator>
+          <!-- Add in the DynamicImport-Package ONLY the packages that -->
+          <!-- contains types that MUST be unmarshalled by the -->
+          <!-- infinispan. They need to be wired at runtime even during -->
+          <!-- the bundle is already RESOLVED, but at the same time if -->
+          <!-- those are missing the bundle will still come up, this is -->
+          <!-- why those dependencies ends in the DynamicImport-Package -->
+          <!-- rather in the Import-Package -->
+          <DynamicImport-Package>
+            *
+          </DynamicImport-Package>
+          <Embed-Dependency>
+            infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false
+          </Embed-Dependency>
+          <Embed-Transitive>
+            true
+          </Embed-Transitive>
+        </instructions>
         <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>org.opendaylight.controller.*</includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>      
-    </plugins>
+      </configuration>
+    </plugin>
+    <plugin>
+      <groupId>org.jacoco</groupId>
+      <artifactId>jacoco-maven-plugin</artifactId>
+      <configuration>
+        <includes>org.opendaylight.controller.*</includes>
+      </configuration>
+      <executions>
+        <execution>
+          <id>pre-test</id>
+          <goals>
+            <goal>prepare-agent</goal>
+          </goals>
+        </execution>
+        <execution>
+          <id>post-test</id>
+          <phase>test</phase>
+          <goals>
+            <goal>report</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+  </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core</artifactId>
-      <version>5.2.3.Final</version>
+      <version>5.3.0.Final</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -108,7 +116,12 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossts.jta</groupId>
+      <artifactId>narayana-jta</artifactId>
+      <version>4.17.7.Final</version>
     </dependency>
   </dependencies>
 </project>