Author: gnodet
Date: Thu Sep 10 10:02:32 2009
New Revision: 813338
URL: http://svn.apache.org/viewvc?rev=813338&view=rev
Log:
Fix NOTICE files in jars
Modified:
felix/trunk/gogo/NOTICE
felix/trunk/gogo/commands/pom.xml
felix/trunk/gogo/console/pom.xml
felix/trunk/gogo/launcher/pom.xml
felix/trunk/gogo/runtime/pom.xml
Modified: felix/trunk/gogo/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/NOTICE?rev=813338&r1=813337&r2=813338&view=diff
==============================================================================
--- felix/trunk/gogo/NOTICE (original)
+++ felix/trunk/gogo/NOTICE Thu Sep 10 10:02:32 2009
@@ -21,9 +21,6 @@
Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
III. License Summary
- Apache License 2.0
Modified: felix/trunk/gogo/commands/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/commands/pom.xml?rev=813338&r1=813337&r2=813338&view=diff
==============================================================================
--- felix/trunk/gogo/commands/pom.xml (original)
+++ felix/trunk/gogo/commands/pom.xml Thu Sep 10 10:02:32 2009
@@ -61,6 +61,7 @@
</Import-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
+
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
</instructions>
Modified: felix/trunk/gogo/console/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/console/pom.xml?rev=813338&r1=813337&r2=813338&view=diff
==============================================================================
--- felix/trunk/gogo/console/pom.xml (original)
+++ felix/trunk/gogo/console/pom.xml Thu Sep 10 10:02:32 2009
@@ -64,6 +64,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
<Bundle-Activator>org.apache.felix.gogo.console.Activator</Bundle-Activator>
+
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
</instructions>
Modified: felix/trunk/gogo/launcher/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/launcher/pom.xml?rev=813338&r1=813337&r2=813338&view=diff
==============================================================================
--- felix/trunk/gogo/launcher/pom.xml (original)
+++ felix/trunk/gogo/launcher/pom.xml Thu Sep 10 10:02:32 2009
@@ -67,6 +67,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
<Bundle-Activator>org.apache.felix.gogo.runtime.Activator</Bundle-Activator>
+
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
</instructions>
Modified: felix/trunk/gogo/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=813338&r1=813337&r2=813338&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Thu Sep 10 10:02:32 2009
@@ -66,6 +66,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
<Bundle-Activator>org.apache.felix.gogo.runtime.Activator</Bundle-Activator>
+
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
</instructions>
