Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump versions to 6.0.5-SNAPSHOT
[odlparent.git] / karaf / opendaylight-karaf-resources / pom.xml
diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 1204e84880e0fd5a09e0c7c0d1665af2342bfa65..4f5c9cc0df6aeb5e6bd714a114ffa452a670a036 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>6.0.5-SNAPSHOT</version>
     <relativePath>../../odlparent</relativePath>
   </parent>
   <artifactId>opendaylight-karaf-resources</artifactId>
@@ -40,7 +40,20 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+
+    <!-- BouncyCastle Framework Extension Bundles -->
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>bcpkix-framework-ext</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>bcprov-framework-ext</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -66,19 +79,23 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance"
                        failonerror="true"/>
+                <replace file="${project.build.directory}/assembly/bin/instance"
+                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance"
                       tofile="${project.build.directory}/classes/bin/instance"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.bat.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance.bat"
                        failonerror="true" ignorewhitespace="true"/>
+                <replace file="${project.build.directory}/assembly/bin/instance.bat"
+                         token="1.10.2" value="1.10.1" failOnNoReplacements="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"
@@ -88,7 +105,15 @@
                        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"
+                <replace file="${project.build.directory}/assembly/bin/shell"
+                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/bin/shell"
+                      tofile="${project.build.directory}/classes/bin/shell"/>
+                <replace file="${project.build.directory}/assembly/bin/shell.bat"
+                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/bin/shell.bat"
+                      tofile="${project.build.directory}/classes/bin/shell.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"
@@ -98,23 +123,39 @@
                        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"
-                       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-javax-mail-${karaf.version}.patch"
+                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
+                         token="/1.10.2" value="/1.10.1" failOnNoReplacements="true"/>
+                <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"/>
+                <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.12" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
+                <!-- 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.4" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.6" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
+                         token="org.jolokia/jolokia-osgi/1.6.1" value="org.jolokia/jolokia-osgi/1.6.2" 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"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-paxweb.patch"
-                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"
-                       failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-etc-startup-properties-${karaf.version}.patch"
-                       originalfile="${project.build.directory}/assembly/etc/startup.properties"
-                       failonerror="true"/>
-                <echo file="${project.build.directory}/assembly/etc/system.properties" append="true">mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8</echo>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-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.10/pax-web-features-7.2.10-features.xml"
+                         token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"/>
+                <replace file="${project.build.directory}/assembly/etc/startup.properties"
+                         token="/1.10.2" value="/1.10.1" failOnNoReplacements="true"/>
+                <!-- 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.opendaylight.odlparent/bcprov-framework-ext/${project.version} = 14
+mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/${project.version} = 14
+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"/>
                 <fixcrlf srcdir="${project.build.directory}/classes/bin"
@@ -129,36 +170,30 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-framework-extensions</id>
             <goals>
               <goal>copy</goal>
             </goals>
             <phase>generate-resources</phase>
             <configuration>
               <artifactItems>
-                <!-- Needs to be copied to lib/ext in order to start bouncy provider for mina sshd -->
-                <artifactItem>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <version>${bouncycastle.version}</version>
-                    <outputDirectory>target/classes/lib/ext</outputDirectory>
-                    <destFileName>bcprov-jdk15on-${bouncycastle.version}.jar</destFileName>
-                </artifactItem>
+                <!-- 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>
                     <version>${bouncycastle.version}</version>
-                    <outputDirectory>target/classes/lib/ext</outputDirectory>
+                    <outputDirectory>target/classes/lib/boot</outputDirectory>
                     <destFileName>bcprov-ext-jdk15on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcpkix-jdk15on</artifactId>
                     <version>${bouncycastle.version}</version>
-                    <outputDirectory>target/classes/lib/ext</outputDirectory>
+                    <outputDirectory>target/classes/lib/boot</outputDirectory>
                     <destFileName>bcpkix-jdk15on-${bouncycastle.version}.jar</destFileName>
                 </artifactItem>
               </artifactItems>
+              <silent>true</silent>
             </configuration>
           </execution>
         </executions>
@@ -191,7 +226,7 @@
              as the karaf4-parent will do this again                -->
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.plugin.version}</version>
+        <version>${karaf.version}</version>
         <executions>
           <execution>
             <id>process-resources</id>
@@ -206,7 +241,7 @@
       <plugin>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-plugin</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>6.0.5-SNAPSHOT</version>
         <executions>
           <execution>
             <id>populate-local-repo</id>
odlparent