felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1097847 - in /felix/trunk/dependencymanager: compat/pom.xml core/NOTICE core/pom.xml runtime/LICENSE.json runtime/pom.xml shell/pom.xml
Date Fri, 29 Apr 2011 15:40:24 GMT
Author: marrs
Date: Fri Apr 29 15:40:23 2011
New Revision: 1097847

URL: http://svn.apache.org/viewvc?rev=1097847&view=rev
Log:
More updates to the poms and licenses.

Added:
    felix/trunk/dependencymanager/runtime/LICENSE.json
Modified:
    felix/trunk/dependencymanager/compat/pom.xml
    felix/trunk/dependencymanager/core/NOTICE
    felix/trunk/dependencymanager/core/pom.xml
    felix/trunk/dependencymanager/runtime/pom.xml
    felix/trunk/dependencymanager/shell/pom.xml

Modified: felix/trunk/dependencymanager/compat/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/compat/pom.xml?rev=1097847&r1=1097846&r2=1097847&view=diff
==============================================================================
--- felix/trunk/dependencymanager/compat/pom.xml (original)
+++ felix/trunk/dependencymanager/compat/pom.xml Fri Apr 29 15:40:23 2011
@@ -46,6 +46,17 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -69,7 +80,6 @@
                         <Export-Package>org.apache.felix.dependencymanager"</Export-Package>
                         <Import-Package>!org.apache.felix.dependencymanager,org.apache.felix.dm;version="[3,4)",*</Import-Package>
                         <Private-Package>org.apache.felix.dependencymanager.impl</Private-Package>
-                        <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>

Modified: felix/trunk/dependencymanager/core/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/NOTICE?rev=1097847&r1=1097846&r2=1097847&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/NOTICE (original)
+++ felix/trunk/dependencymanager/core/NOTICE Fri Apr 29 15:40:23 2011
@@ -5,3 +5,8 @@ Copyright 2011 The Apache Software Found
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.

Modified: felix/trunk/dependencymanager/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/pom.xml?rev=1097847&r1=1097846&r2=1097847&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/pom.xml (original)
+++ felix/trunk/dependencymanager/core/pom.xml Fri Apr 29 15:40:23 2011
@@ -45,6 +45,17 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -76,7 +87,6 @@
                         <Export-Package>org.apache.felix.dm;version="3.0.0";provide:=true,org.apache.felix.dm.tracker;version="3.0.0";provide:=true</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.felix.dm.impl, org.apache.felix.dm.impl.*</Private-Package>
-                        <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
                         <!-- Uncomment this next line to include source code in the bundle.
                         <Include-Resource>src/main/java</Include-Resource>
                         -->

Added: felix/trunk/dependencymanager/runtime/LICENSE.json
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/LICENSE.json?rev=1097847&view=auto
==============================================================================
--- felix/trunk/dependencymanager/runtime/LICENSE.json (added)
+++ felix/trunk/dependencymanager/runtime/LICENSE.json Fri Apr 29 15:40:23 2011
@@ -0,0 +1,21 @@
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file

Modified: felix/trunk/dependencymanager/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/pom.xml?rev=1097847&r1=1097846&r2=1097847&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/pom.xml (original)
+++ felix/trunk/dependencymanager/runtime/pom.xml Fri Apr 29 15:40:23 2011
@@ -53,6 +53,17 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -86,7 +97,6 @@
                         <Export-Package/>
                         <Embed-Dependency>json</Embed-Dependency>
                         <Bundle-Activator>org.apache.felix.dm.runtime.Activator</Bundle-Activator>
-                        <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>

Modified: felix/trunk/dependencymanager/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/pom.xml?rev=1097847&r1=1097846&r2=1097847&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/pom.xml (original)
+++ felix/trunk/dependencymanager/shell/pom.xml Fri Apr 29 15:40:23 2011
@@ -66,6 +66,17 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -97,7 +108,6 @@
                         <Export-Package/>
                         <Private-Package>org.apache.felix.dm.shell</Private-Package>
                         <Import-Package>org.apache.felix.shell;resolution:=optional,
org.eclipse.osgi.framework.console;resolution:=optional, org.apache.felix.service.command;resolution:=optional,
*</Import-Package>
-                        <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message