Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug 8571: copy src/main/assembly
[odlparent.git] / karaf / karaf4-parent / pom.xml
diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 9a1b95d142f0a7911a2156cfd45fa6d3dc592205..aa52fa597ec62b78afdcc7b7a575d0ab04962867 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../odlparent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -34,27 +34,20 @@
             <dependency>
                 <groupId>org.apache.karaf.features</groupId>
                 <artifactId>framework</artifactId>
-                <version>${karaf4.version}</version>
+                <version>${karaf.version}</version>
                 <type>kar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.karaf.features</groupId>
                 <artifactId>framework</artifactId>
-                <version>${karaf4.version}</version>
+                <version>${karaf.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.karaf.features</groupId>
                 <artifactId>standard</artifactId>
-                <version>${karaf4.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.features</groupId>
-                <artifactId>spring</artifactId>
-                <version>${karaf4.version}</version>
+                <version>${karaf.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
@@ -82,11 +75,13 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>spring</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
+            <groupId>org.apache.aries.quiesce</groupId>
+            <artifactId>org.apache.aries.quiesce.api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <!-- for https://bugs.opendaylight.org/show_bug.cgi?id=4290 -->
+            <artifactId>org.osgi.service.event</artifactId>
         </dependency>
 
         <!-- ODL Branding -->
@@ -97,23 +92,12 @@
         <!-- ODL configuration -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>opendaylight-karaf4-resources</artifactId>
+            <artifactId>opendaylight-karaf-resources</artifactId>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <configuration>
@@ -135,9 +119,9 @@
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
                                     <artifactId>karaf.branding</artifactId>
-                                    <version>1.8.0-SNAPSHOT</version>
+                                    <version>2.0.0-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-1.8.0-SNAPSHOT.jar</destFileName>
+                                    <destFileName>karaf.branding-2.0.0-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -151,7 +135,7 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/assembly</outputDirectory>
                             <groupId>org.opendaylight.odlparent</groupId>
-                            <includeArtifactIds>opendaylight-karaf4-resources</includeArtifactIds>
+                            <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
                             <excludes>META-INF\/**</excludes>
                             <excludeTransitive>true</excludeTransitive>
                             <ignorePermissions>false</ignorePermissions>
@@ -167,7 +151,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
-                                    <artifactId>opendaylight-karaf4-resources</artifactId>
+                                    <artifactId>opendaylight-karaf-resources</artifactId>
                                     <type>properties</type>
                                     <classifier>config</classifier>
                                     <overWrite>true</overWrite>
@@ -185,8 +169,8 @@
             <!-- This needs to execute before patching, otherwise the feature will be left unpatched -->
             <plugin>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>karaf4-plugin</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <artifactId>karaf-plugin</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>populate-local-repo</id>
@@ -219,35 +203,69 @@
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-instance.bat.patch"
                                        originalfile="${project.build.directory}/assembly/bin/instance.bat"
                                        failonerror="true" ignorewhitespace="true"/>
-                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-karaf.patch"
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-karaf-${karaf.version}.patch"
                                        originalfile="${project.build.directory}/assembly/bin/karaf"
                                        failonerror="true"/>
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-karaf.bat.patch"
                                        originalfile="${project.build.directory}/assembly/bin/karaf.bat"
                                        failonerror="true"/>
-                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-setenv.patch"
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-setenv-${karaf.version}.patch"
                                        originalfile="${project.build.directory}/assembly/bin/setenv"
                                        failonerror="true"/>
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-setenv.bat.patch"
                                        originalfile="${project.build.directory}/assembly/bin/setenv.bat"
                                        failonerror="true"/>
-                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-quiesce-4.0.7.patch"
-                                       originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-features.xml"
+                                <patch patchfile="${project.build.directory}/assembly/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.build.directory}/assembly/patches/karaf-javax-mail-${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.build.directory}/assembly/patches/karaf-paxweb.patch"
+                                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml"
                                        failonerror="true"/>
-                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-javax-mail.patch"
-                                       originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-features.xml"
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-etc-startup-properties-4.0.9.patch"
+                                       originalfile="${project.build.directory}/assembly/etc/startup.properties"
                                        failonerror="true"/>
                                 <fixcrlf srcdir="${project.build.directory}/assembly/bin"
                                          includes="*.bat" eol="crlf"/>
+                                <echo file="${project.build.directory}/assembly/etc/system.properties" append="true">mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8</echo>
                             </target>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/assembly</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/assembly</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>process-resources</id>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>${karaf4.plugin.version}</version>
+                <version>${karaf.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>process-resources</id>
@@ -269,7 +287,6 @@
                     </installedFeatures>
                     <bootFeatures>
                         <feature>standard</feature>
-                        <feature>war</feature>
                         <!-- We load wrap as a workaround to handle old features without the wrap prerequisite -->
                         <!-- TODO Remove this once all the downstream features are fixed -->
                         <feature>wrap</feature>
odlparent