<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>7.0.3-SNAPSHOT</version>
+ <version>13.0.10-SNAPSHOT</version>
<relativePath>../../odlparent</relativePath>
</parent>
<artifactId>opendaylight-karaf-resources</artifactId>
just have odlparent-lite not odlparent as parent, and not run Java static code analysis tools.)
-->
<duplicate-finder.skip>true</duplicate-finder.skip>
+ <!-- jacoco:report bombs out on BouncyCastle's JDK15 classes, it has not point anyway -->
+ <jacoco.skip>true</jacoco.skip>
</properties>
<dependencies>
<dependency>
<artifactId>bcprov-framework-ext</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>bcutil-framework-ext</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- SLF4J logging markers -->
<dependency>
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.patch"
- originalfile="${project.build.directory}/assembly/bin/setenv"
- failonerror="true"/>
- <copy file="${project.build.directory}/assembly/bin/setenv"
- tofile="${project.build.directory}/classes/bin/setenv"/>
- <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv.bat.patch"
- originalfile="${project.build.directory}/assembly/bin/setenv.bat"
- failonerror="true"/>
- <copy file="${project.build.directory}/assembly/bin/setenv.bat"
- tofile="${project.build.directory}/classes/bin/setenv.bat"/>
+ <!-- FIXME: ODLPARENT-298: remove this instruction -->
<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"/>
+ <patch patchfile="${project.basedir}/src/main/patches/karaf-remove-bc.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.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="javax.annotation/javax.annotation-api/1.3<" value="javax.annotation/javax.annotation-api/1.3.1<" failOnNoReplacements="true"/>
+ token="commons-io/commons-io/2.13.0" value="commons-io/commons-io/2.15.1" 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.9" value="org.apache.commons/commons-lang3/3.10" failOnNoReplacements="true"/>
+ token="org.apache.commons/commons-lang3/3.13.0" value="org.apache.commons/commons-lang3/3.14.0" 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.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"/>
+ <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
+ tofile="${project.build.directory}/classes/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"/>
+ <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-features.xml"
+ token="/2.15.2" value="/2.15.3" failOnNoReplacements="true"/>
+ <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-features.xml"
+ tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-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
-mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2 = 8
+mvn\:org.osgi/org.osgi.service.event/1.4.1 = 7
+mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8
mvn\:org.opendaylight.odlparent/bcprov-framework-ext/${project.version} = 14
+mvn\:org.opendaylight.odlparent/bcutil-framework-ext/${project.version} = 14
mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/${project.version} = 14
mvn\:org.opendaylight.odlparent/logging-markers/${project.version} = 14
+# NOTE: this entry will be removed by https://jira.opendaylight.org/browse/ODLPARENT-297
mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
</echo>
<copy file="${project.build.directory}/assembly/etc/startup.properties"
tofile="${project.build.directory}/classes/etc/startup.properties"/>
+ <replace file="${project.build.directory}/assembly/etc/users.properties"
+ token="#karaf" value="karaf" failOnNoReplacements="true"/>
+ <replace file="${project.build.directory}/assembly/etc/users.properties"
+ token="#_g_" value="_g_" failOnNoReplacements="true"/>
+ <copy file="${project.build.directory}/assembly/etc/users.properties"
+ tofile="${project.build.directory}/classes/etc/users.properties"/>
<fixcrlf srcdir="${project.build.directory}/classes/bin"
includes="*.bat" eol="crlf"/>
</target>
<!-- Needs to be copied to lib/boot in order have it accessible to Main class -->
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
+ <artifactId>bcprov-ext-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <outputDirectory>target/classes/lib/boot</outputDirectory>
+ <destFileName>bcprov-ext-jdk18on-${bouncycastle.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<outputDirectory>target/classes/lib/boot</outputDirectory>
- <destFileName>bcprov-ext-jdk15on-${bouncycastle.version}.jar</destFileName>
+ <destFileName>bcpkix-jdk18on-${bouncycastle.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<outputDirectory>target/classes/lib/boot</outputDirectory>
- <destFileName>bcpkix-jdk15on-${bouncycastle.version}.jar</destFileName>
+ <destFileName>bcutil-jdk18on-${bouncycastle.version}.jar</destFileName>
</artifactItem>
</artifactItems>
<silent>true</silent>
<plugin>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf-plugin</artifactId>
- <version>7.0.3-SNAPSHOT</version>
+ <version>13.0.10-SNAPSHOT</version>
<executions>
<execution>
<id>populate-local-repo</id>