<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<properties>
- <branding.version>1.2.0-SNAPSHOT</branding.version>
- <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
+ <branding.version>1.3.0-SNAPSHOT</branding.version>
+ <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
<karaf.localFeature>standard</karaf.localFeature>
<!-- Karaf Maven plugin 3.023 reinstalls already installed
boot features to container, which could be observed
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</exclusion>
+ <!-- We provide a newer version of Aries Proxy -->
+ <exclusion>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
+ </dependency>
+ <!-- karaf region dependency -->
+ <dependency>
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>org.apache.karaf.region.persist</artifactId>
+ <version>${karaf.version}</version>
<scope>runtime</scope>
</dependency>
<!-- ODL Branding -->
<artifactId>opendaylight-karaf-resources</artifactId>
<version>${karaf.resources.version}</version>
</dependency>
+
+ <!-- Aries Proxy 1.0.5 contains important bug fixes -->
+ <!-- Once we upgrade to a version of Karaf which has at least 1.0.5, this can be removed -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>1.0.5</version>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
<include name="shell"/>
</fileset>
</chmod>
+ <!-- Remove this once Karaf provides a new-enough version of Aries Proxy -->
+ <replace dir="${project.build.directory}/assembly/etc" token="org.apache.aries.proxy.impl/1.0.4"
+ value="org.apache.aries.proxy.impl/1.0.5">
+ <include name="startup.properties"/>
+ </replace>
</tasks>
</configuration>
</execution>