You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/11/21 15:26:27 UTC
svn commit: r1815935 - in /felix/trunk/http/whiteboard: pom.xml
src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java
src/main/java/org/apache/felix/http/whiteboard/package-info.java
Author: cziegeler
Date: Tue Nov 21 15:26:27 2017
New Revision: 1815935
URL: http://svn.apache.org/viewvc?rev=1815935&view=rev
Log:
FELIX-5746 : Make optional dependencies runtime optional
Modified:
felix/trunk/http/whiteboard/pom.xml
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
Modified: felix/trunk/http/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=1815935&r1=1815934&r2=1815935&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Tue Nov 21 15:26:27 2017
@@ -46,16 +46,27 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>3.3.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Activator>
org.apache.felix.http.whiteboard.internal.WhiteboardActivator
</Bundle-Activator>
+ <Import-Package>
+ org.osgi.service.log;resolution:=optional;version="[1.3,2)",
+ *
+ </Import-Package>
+ <DynamicImport-Package>
+ org.osgi.service.log;version="[1.3,2)"
+ </DynamicImport-Package>
<Embed-Dependency>
org.apache.felix.http.base;inline=org/apache/felix/http/base/internal/AbstractActivator*.class|
org/apache/felix/http/base/internal/logger/*
</Embed-Dependency>
+ <Require-Capability>
+ osgi.implementation;filter:="(&(osgi.implementation=osgi.http)(version>=1.1)(!(version>=2.0)))"
+ </Require-Capability>
</instructions>
</configuration>
</plugin>
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java?rev=1815935&r1=1815934&r2=1815935&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/HttpWhiteboardConstants.java Tue Nov 21 15:26:27 2017
@@ -23,6 +23,7 @@ package org.apache.felix.http.whiteboard
* used by the Http Whiteboard registration support.
*
* @since Http Whiteboard Bundle 2.3.0
+ * @deprecated Use the OSGi Http Whiteboard Service instead
*/
@Deprecated
public class HttpWhiteboardConstants
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java?rev=1815935&r1=1815934&r2=1815935&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java Tue Nov 21 15:26:27 2017
@@ -17,10 +17,7 @@
* under the License.
*/
-/**
- * @see: @TODO ref to whiteboard page on felix.apache.org
- */
-@Version("1.0")
+@Version("1.0.1")
package org.apache.felix.http.whiteboard;
import org.osgi.annotation.versioning.Version;