<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-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>
+ <version>0.4.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
<!-- Sonar properties using jacoco to retrieve integration test results -->
- <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
<sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.language>java</sonar.language>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>equinoxSDK381</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>6.0.2.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <version>4.17.7.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>clustering.services</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>commons.logback_settings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal</artifactId>
+ </dependency>
+ </dependencies>
<build>
<pluginManagement>
<plugins>
</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.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>
- <plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <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,infinispan-commons,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.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${enforcer.version}</version>
<exclude>org.infinispan:infinispan-core:*</exclude>
</excludes>
<includes>
- <include>org.infinispan:infinispan-core:[5.3.0.Final]</include>
+ <include>org.infinispan:infinispan-core:[6.0.2.Final]</include>
</includes>
</bannedDependencies>
</rules>
</execution>
</executions>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org.opendaylight.controller.*</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>post-test</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>5.3.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>clustering.services</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal</artifactId>
- <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>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
</project>
Code Review / controller.git / blobdiff