<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>13.0.9</version>
<relativePath>../bundle-parent</relativePath>
</parent>
<dependency>
<groupId>org.osgi</groupId>
<!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.resolver</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<dependency>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>org.apache.karaf.deployer.blueprint</artifactId>
- <version>${karaf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>org.apache.karaf.deployer.features</artifactId>
- <version>${karaf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
+ <groupId>com.guicedee.services</groupId>
<artifactId>javax.inject</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.annotation</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>opendaylight-karaf-empty</artifactId>
<dependency>
<groupId>org.apache.karaf.bundle</groupId>
<artifactId>org.apache.karaf.bundle.core</artifactId>
- <version>${karaf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>compile</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>compile</scope>
</dependency>
+
<!-- The following, which are just transitive dependencies of bundles4-test,
have to be repeated here so that the Embed-Dependency below for maven-bundle-plugin works: -->
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>provided</scope>
</dependency>
- <!-- Real <scope>test dependencies, just for SingleFeatureTestUnitTest -->
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- <scope>test</scope>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
<executions>
<execution>
<id>check-license</id>