You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/24 16:53:49 UTC
svn commit: r1329772 - in /karaf/trunk/package: command/pom.xml core/NOTICE
core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Author: jbonofre
Date: Tue Apr 24 14:53:49 2012
New Revision: 1329772
URL: http://svn.apache.org/viewvc?rev=1329772&view=rev
Log:
[KARAF-1383] Fix build warning messages in package modules
Added:
karaf/trunk/package/core/NOTICE
Modified:
karaf/trunk/package/command/pom.xml
karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: karaf/trunk/package/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/command/pom.xml?rev=1329772&r1=1329771&r2=1329772&view=diff
==============================================================================
--- karaf/trunk/package/command/pom.xml (original)
+++ karaf/trunk/package/command/pom.xml Tue Apr 24 14:53:49 2012
@@ -94,8 +94,8 @@
<Export-Package>!*</Export-Package>
<Private-Package>
org.apache.karaf.packages.command*,
- org.apache.felix.utils.version,
- org.apache.felix.utils.manifest,
+ org.apache.felix.utils.version;-split-package:=merge-first,
+ org.apache.felix.utils.manifest;-split-package:=merge-first,
!*
</Private-Package>
</instructions>
Added: karaf/trunk/package/core/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/NOTICE?rev=1329772&view=auto
==============================================================================
--- karaf/trunk/package/core/NOTICE (added)
+++ karaf/trunk/package/core/NOTICE Tue Apr 24 14:53:49 2012
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010-2012 The Apache Software Foundation
+
+
+I. Included Software
+
+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 written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
Modified: karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1329772&r1=1329771&r2=1329772&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 24 14:53:49 2012
@@ -31,7 +31,7 @@
<argument ref="packageService" />
</bean>
- <service interface="org.apache.karaf.packages.core.PackagesMBean" ref="packageMBean">
+ <service ref="packageMBean" auto-export="interfaces">
<service-properties>
<entry key="jmx.objectname" value="org.apache.karaf:type=package,name=${karaf.name}"/>
</service-properties>