<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>6.0.2-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../../odlparent</relativePath>
</parent>
<artifactId>opendaylight-karaf-resources</artifactId>
failonerror="true" ignorewhitespace="true"/>
<copy file="${project.build.directory}/assembly/bin/instance.bat"
tofile="${project.build.directory}/classes/bin/instance.bat"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-inc-${karaf.version}.patch"
+ <patch patchfile="${project.basedir}/src/main/patches/karaf-inc.patch"
originalfile="${project.build.directory}/assembly/bin/inc"
failonerror="true"/>
<copy file="${project.build.directory}/assembly/bin/inc"
tofile="${project.build.directory}/classes/bin/inc"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-karaf-${karaf.version}.patch"
+ <patch patchfile="${project.basedir}/src/main/patches/karaf-karaf.patch"
originalfile="${project.build.directory}/assembly/bin/karaf"
failonerror="true"/>
<copy file="${project.build.directory}/assembly/bin/karaf"
failonerror="true"/>
<copy file="${project.build.directory}/assembly/bin/karaf.bat"
tofile="${project.build.directory}/classes/bin/karaf.bat"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv-${karaf.version}.patch"
+ <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv.patch"
originalfile="${project.build.directory}/assembly/bin/setenv"
failonerror="true"/>
<copy file="${project.build.directory}/assembly/bin/setenv"
failonerror="true"/>
<copy file="${project.build.directory}/assembly/bin/setenv.bat"
tofile="${project.build.directory}/classes/bin/setenv.bat"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce-${karaf.version}.patch"
+ <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
failonerror="true"/>
<replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
- token="commons-codec/commons-codec/1.10" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
+ token="commons-codec/commons-codec/1.13" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
<replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
- token="org.apache.commons/commons-lang3/3.8.1" value="org.apache.commons/commons-lang3/3.9" failOnNoReplacements="true"/>
- <!-- fixes https://issues.apache.org/jira/browse/KARAF-5086 -->
- <!-- fixes https://issues.apache.org/jira/browse/ARIES-1923 -->
- <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
- token="org.apache.aries.proxy/org.apache.aries.proxy/1.1.3" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.6" failOnNoReplacements="true"/>
+ token="javax.annotation/javax.annotation-api/1.3<" value="javax.annotation/javax.annotation-api/1.3.1<" failOnNoReplacements="true"/>
<copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
- <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- token="commons-beanutils/commons-beanutils/1.8.3" value="commons-beanutils/commons-beanutils/1.9.4" failOnNoReplacements="true"/>
- <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- token="commons-codec/commons-codec/1.8" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
- <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- token="javax.mail/mail/1.4.4" value="javax.mail/mail/1.4.7" failOnNoReplacements="true"/>
- <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- token="org.apache.aries/org.apache.aries.util/1.1.0" value="org.apache.aries/org.apache.aries.util/1.1.3" failOnNoReplacements="true"/>
- <!-- Keep consistency with standard-features.xml -->
- <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- token="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.10" value="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2" failOnNoReplacements="true"/>
- <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
- tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"/>
+ <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
+ token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
+ <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
+ token="javax.annotation/javax.annotation-api/1.3<" value="javax.annotation/javax.annotation-api/1.3.1<" failOnNoReplacements="true"/>
+ <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
+ tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"/>
<!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
<echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
# The following are added by opendaylight-karaf-resources
<plugin>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf-plugin</artifactId>
- <version>6.0.2-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>populate-local-repo</id>