You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/10/06 16:08:46 UTC

svn commit: r1529619 - in /felix/trunk/ipojo/runtime/karaf-feature: ./ src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/assembly/ src/main/features/

Author: clement
Date: Sun Oct  6 14:08:45 2013
New Revision: 1529619

URL: http://svn.apache.org/r1529619
Log:
Build a zip file containing the Karaf feature and legal files.

Added:
    felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/
    felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/
    felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/DEPENDENCIES
    felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/
    felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/assembly.xml
Modified:
    felix/trunk/ipojo/runtime/karaf-feature/pom.xml
    felix/trunk/ipojo/runtime/karaf-feature/src/main/features/features.xml

Modified: felix/trunk/ipojo/runtime/karaf-feature/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/karaf-feature/pom.xml?rev=1529619&r1=1529618&r2=1529619&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/karaf-feature/pom.xml (original)
+++ felix/trunk/ipojo/runtime/karaf-feature/pom.xml Sun Oct  6 14:08:45 2013
@@ -41,6 +41,7 @@
 
     <properties>
         <ipojo.webconsole.version>1.7.0</ipojo.webconsole.version>
+        <legal.files>${project.build.directory}/maven-shared-archive-resources/META-INF</legal.files>
     </properties>
 
     <build>
@@ -89,6 +90,29 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-archive</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

Added: felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1529619&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/ipojo/runtime/karaf-feature/src/main/appended-resources/META-INF/DEPENDENCIES Sun Oct  6 14:08:45 2013
@@ -0,0 +1,10 @@
+I. Included Third-Party Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Third-Party Software
+
+III. Overall License Summary
+- Apache License 2.0

Added: felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/assembly.xml?rev=1529619&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/assembly.xml (added)
+++ felix/trunk/ipojo/runtime/karaf-feature/src/main/assembly/assembly.xml Sun Oct  6 14:08:45 2013
@@ -0,0 +1,46 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>feature</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>/</baseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <includes>
+                <include>features.xml</include>
+            </includes>
+            <outputDirectory/>
+        </fileSet>
+
+        <fileSet>
+            <directory>${legal.files}</directory>
+            <outputDirectory/>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file

Modified: felix/trunk/ipojo/runtime/karaf-feature/src/main/features/features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/karaf-feature/src/main/features/features.xml?rev=1529619&r1=1529618&r2=1529619&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/karaf-feature/src/main/features/features.xml (original)
+++ felix/trunk/ipojo/runtime/karaf-feature/src/main/features/features.xml Sun Oct  6 14:08:45 2013
@@ -19,7 +19,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="${project.artifactId}">
 
-
     <feature name="ipojo" version="${project.version}"
              description="Apache Felix iPOJO Core Runtime">
         <bundle>mvn:${project.groupId}/org.apache.felix.ipojo/${project.version}</bundle>