Karaf 3.0.3 ships with Aries Proxy 1.0.4, but we need the fixes in
version 1.0.5. This patch adds Aries Proxy 1.0.5 to our Karaf
distributions and overrides the version in startup.properties.
Change-Id: Ibe77bc14404e30ea571e46589c983d2e2c47dde5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</exclusion>
<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>
</exclusions>
</dependency>
</dependencies>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<!-- karaf region dependency -->
<dependency>
</dependency>
<!-- karaf region dependency -->
<dependency>
<artifactId>opendaylight-karaf-resources</artifactId>
<version>${karaf.resources.version}</version>
</dependency>
<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>
</dependencies>
<build>
<pluginManagement>
<include name="shell"/>
</fileset>
</chmod>
<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>
</tasks>
</configuration>
</execution>
<relativePath>../karaf-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<relativePath>../karaf-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>opendaylight-karaf-empty</artifactId>
<artifactId>opendaylight-karaf-empty</artifactId>
- <version>1.7.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<prerequisites>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<prerequisites>
<type>xml</type>
</dependency>
<type>xml</type>
</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>
+
<!--
controller provided features:
Note: Nothing should go here that is not locked
<!--
controller provided features:
Note: Nothing should go here that is not locked
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>features-mdsal</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>features-mdsal</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>features-mdsal-model</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>features-mdsal-model</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
<extensions>true</extensions>
<configuration>
<!-- no startupFeatures -->
<extensions>true</extensions>
<configuration>
<!-- no startupFeatures -->
<ignorePermissions>false</ignorePermissions>
</configuration>
</execution>
<ignorePermissions>false</ignorePermissions>
</configuration>
</execution>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+ <excludeArtifactIds>distribution.vtn-coordinator</excludeArtifactIds>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <useRepositoryLayout>true</useRepositoryLayout>
+ <addParentPoms>true</addParentPoms>
+ <copyPom>true</copyPom>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
</executions>
</plugin>
<plugin>
<include name="shell"/>
</fileset>
</chmod>
<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>
</tasks>
</configuration>
</execution>