From ea44abd5a991adf6d4d89c9333c4b7e831d29b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raymond=20Aug=C3=A9?= <rotty3000@apache.org>
Date: Mon, 9 Dec 2019 23:57:51 -0500
Subject: [PATCH 1/3] ARIES-1959 Add RequireCDIExtension annotation to simplify
 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raymond Augé <rotty3000@apache.org>
---
 .../aries/cdi/extra/RequireCDIExtension.java  | 122 ++++++++++++++++++
 .../aries/cdi/extra/RequireCDIExtensions.java |  32 +++++
 .../apache/aries/cdi/extra/package-info.java  |  19 +++
 .../propertytypes/HttpWhiteboardContext.java  |   2 +
 .../HttpWhiteboardFilterPattern.java          |   2 +
 .../HttpWhiteboardFilterRegex.java            |   2 +
 .../HttpWhiteboardFilterServlet.java          |   2 +
 .../propertytypes/HttpWhiteboardListener.java |   2 +
 .../propertytypes/HttpWhiteboardResource.java |   2 +
 .../HttpWhiteboardServletErrorPage.java       |   2 +
 .../HttpWhiteboardServletName.java            |   2 +
 .../HttpWhiteboardServletPattern.java         |   2 +
 .../cdi/extra/propertytypes/package-info.java |   2 +-
 .../cdi/test/cases/AbstractTestCase.java      |  22 +---
 .../org/apache/aries/cdi/test/tb21/A.java     |   8 +-
 .../apache/aries/cdi/test/tb6/BarServlet.java |   6 -
 16 files changed, 199 insertions(+), 30 deletions(-)
 create mode 100644 cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtension.java
 create mode 100644 cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtensions.java
 create mode 100644 cdi-extra/src/main/java/org/apache/aries/cdi/extra/package-info.java

diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtension.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtension.java
new file mode 100644
index 00000000..98ed050e
--- /dev/null
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtension.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.aries.cdi.extra;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+import static org.apache.aries.cdi.extra.RequireCDIExtension.EFFECTIVE_MACRO;
+import static org.apache.aries.cdi.extra.RequireCDIExtension.RESOLUTION_MACRO;
+import static org.apache.aries.cdi.extra.RequireCDIExtension.VALUE_MACRO;
+import static org.apache.aries.cdi.extra.RequireCDIExtension.VERSION_MACRO;
+import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.osgi.annotation.bundle.Requirement;
+
+@Retention(CLASS)
+@Target({
+	PACKAGE, TYPE
+})
+@Repeatable(RequireCDIExtensions.class)
+@Requirement(namespace = CDI_EXTENSION_PROPERTY, name = VALUE_MACRO, attribute = {
+	VERSION_MACRO, EFFECTIVE_MACRO, RESOLUTION_MACRO
+})
+public @interface RequireCDIExtension {
+
+	public static final String	VALUE_MACRO				= "${#value}";
+
+	public static final String	EFFECTIVE_MACRO		= "${if;${size;${#effective}};effective:=${#effective}}";
+
+	public static final String	RESOLUTION_MACRO	= "${if;${is;${#resolution};DEFAULT};;resolution:=${#resolution}}";
+
+	public static final String	VERSION_MACRO	= "${if;${size;${#version}};version=${#version}}";
+
+	/**
+	 * The name of the required extension.
+	 */
+	String value();
+
+	/**
+	 * The version of the required extension.
+	 * <p>
+	 * If not specified, the {@code version} directive is omitted from the
+	 * requirement clause.
+	 */
+	String version() default "";
+
+	/**
+	 * The effective time of the {@code osgi.extender} requirement.
+	 * <p>
+	 * Specifies the time the {@code osgi.extender} requirements are available.
+	 * The OSGi framework resolver only considers requirements without an
+	 * effective directive or {@code effective:=resolve}. Requirements with
+	 * other values for the effective directive can be considered by an external
+	 * agent.
+	 * <p>
+	 * If not specified, the {@code effective} directive is omitted from the
+	 * requirement clause.
+	 */
+	String effective() default "";
+
+	/**
+	 * The resolution policy of the {@code osgi.extender} requirement.
+	 * <p>
+	 * A mandatory requirement forbids the bundle to resolve when this
+	 * requirement is not satisfied; an optional requirement allows a bundle to
+	 * resolve even if this requirement is not satisfied.
+	 * <p>
+	 * If not specified, the {@code resolution} directive is omitted from the
+	 * requirement clause.
+	 */
+	Resolution resolution() default Resolution.DEFAULT;
+
+	public enum Resolution {
+		/**
+		 * A mandatory requirement forbids the bundle to resolve when the
+		 * requirement is not satisfied.
+		 */
+		MANDATORY("mandatory"), // Namespace.RESOLUTION_MANDATORY
+
+		/**
+		 * An optional requirement allows a bundle to resolve even if the
+		 * requirement is not satisfied.
+		 */
+		OPTIONAL("optional"), // Namespace.RESOLUTION_OPTIONAL
+
+		/**
+		 * Default element value for annotation. This is used to distinguish the
+		 * default value for an element and should not otherwise be used.
+		 */
+		DEFAULT("<<default>>");
+
+		private final String value;
+
+		Resolution(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public String toString() {
+			return value;
+		}
+	}
+
+}
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtensions.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtensions.java
new file mode 100644
index 00000000..3127fd8a
--- /dev/null
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/RequireCDIExtensions.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.aries.cdi.extra;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Retention(CLASS)
+@Target({
+	PACKAGE, TYPE
+})
+public @interface RequireCDIExtensions {
+	RequireCDIExtension[] value();
+}
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/package-info.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/package-info.java
new file mode 100644
index 00000000..0c3c0f67
--- /dev/null
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+@org.osgi.annotation.bundle.Export
+@org.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.aries.cdi.extra;
\ No newline at end of file
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
index 7a024ed8..12c747ea 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -43,6 +44,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardContext {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
index 99cdc219..359acdf5 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardFilterPattern {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
index 87c68872..13832384 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardFilterRegex {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
index e090471e..68331b4a 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardFilterServlet {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
index 9eccd7ab..c273f251 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardListener {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
index 4ee66fa8..f363d1fd 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -41,6 +42,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardResource {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
index 7473314f..4f2cce67 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardServletErrorPage {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
index 5209f9b5..a4bd92f8 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardServletName {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
index dbff54e6..6e3d7e54 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
@@ -26,6 +26,7 @@
 
 import javax.enterprise.util.AnnotationLiteral;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.osgi.service.cdi.annotations.BeanPropertyType;
 import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 
@@ -40,6 +41,7 @@
  */
 @BeanPropertyType
 @RequireHttpWhiteboard
+@RequireCDIExtension("aries.cdi.http")
 @Retention(RUNTIME)
 @Target({FIELD, METHOD, TYPE})
 public @interface HttpWhiteboardServletPattern {
diff --git a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java
index 8a49d030..1dd9f19a 100644
--- a/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java
+++ b/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java
@@ -15,5 +15,5 @@
  */
 
 @org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.1.0")
 package org.apache.aries.cdi.extra.propertytypes;
\ No newline at end of file
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
index 085644cf..9ca37f6f 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
@@ -17,7 +17,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
 
 import java.io.InputStream;
 import java.util.Dictionary;
@@ -34,6 +33,7 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -65,22 +65,10 @@
 	filter = "(objectClass=org.osgi.service.cm.ConfigurationAdmin)",
 	namespace = ServiceNamespace.SERVICE_NAMESPACE
 )
-@Requirement(
-	namespace = CDI_EXTENSION_PROPERTY,
-	name = "aries.cdi.http"
-)
-@Requirement(
-	namespace = CDI_EXTENSION_PROPERTY,
-	name = "aries.cdi.jndi"
-)
-@Requirement(
-	namespace = CDI_EXTENSION_PROPERTY,
-	name = "eclipse.microprofile.config"
-)
-@Requirement(
-	namespace = CDI_EXTENSION_PROPERTY,
-	name = "eclipse.microprofile.metrics"
-)
+@RequireCDIExtension("aries.cdi.http")
+@RequireCDIExtension("aries.cdi.jndi")
+@RequireCDIExtension("eclipse.microprofile.config")
+@RequireCDIExtension("eclipse.microprofile.metrics")
 @RequireConfigurator
 public abstract class AbstractTestCase {
 
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb21/A.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb21/A.java
index 7f7a96d3..20ce843a 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb21/A.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb21/A.java
@@ -14,17 +14,13 @@
 
 package org.apache.aries.cdi.test.tb21;
 
+import org.apache.aries.cdi.extra.RequireCDIExtension;
 import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.annotation.bundle.Requirement;
-import org.osgi.service.cdi.CDIConstants;
 import org.osgi.service.cdi.annotations.Bean;
 import org.osgi.service.cdi.annotations.Service;
 
 @Bean
-@Requirement(
-	namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
-	name = "aries.cdi.jndi"
-)
+@RequireCDIExtension("aries.cdi.jndi")
 @Service
 public class A implements Pojo {
 
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java
index c3fe1f53..3936d6c0 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java
@@ -26,17 +26,11 @@
 
 import org.apache.aries.cdi.extra.propertytypes.HttpWhiteboardServletName;
 import org.apache.aries.cdi.extra.propertytypes.HttpWhiteboardServletPattern;
-import org.osgi.annotation.bundle.Requirement;
-import org.osgi.service.cdi.CDIConstants;
 import org.osgi.service.cdi.annotations.Service;
 import org.osgi.service.cdi.annotations.SingleComponent;
 
 @HttpWhiteboardServletName("bar")
 @HttpWhiteboardServletPattern("/bar")
-@Requirement(
-	namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
-	name = "aries.cdi.http"
-)
 @Service(Servlet.class)
 @SingleComponent
 @SuppressWarnings("serial")

From 1364cdb0336e57e7b39764ffcf93fd6eace25d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raymond=20Aug=C3=A9?= <rotty3000@apache.org>
Date: Mon, 9 Dec 2019 23:58:17 -0500
Subject: [PATCH 2/3] actually baseline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raymond Augé <rotty3000@apache.org>
---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca87fc50..914be622 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,8 +303,9 @@
 					<artifactId>bnd-baseline-maven-plugin</artifactId>
 					<version>${bnd.version}</version>
 					<configuration>
-						<includeDistributionManagement>false</includeDistributionManagement>
+						<failOnMissing>false</failOnMissing>
 						<fullReport>true</fullReport>
+						<includeDistributionManagement>false</includeDistributionManagement>
 					</configuration>
 					<executions>
 						<execution>
@@ -426,6 +427,10 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-baseline-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-run-maven-plugin</artifactId>

From 55bfe950ed99f112b9e7077b5cb86d27f8e8ea62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raymond=20Aug=C3=A9?= <rotty3000@apache.org>
Date: Mon, 9 Dec 2019 23:58:40 -0500
Subject: [PATCH 3/3] move jaxrs whiteboard dep to BOM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raymond Augé <rotty3000@apache.org>
---
 cdi-bom/pom.xml                  | 6 ++++++
 cdi-extension-mp-metrics/pom.xml | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 91d52cd8..7e38a138 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -111,6 +111,12 @@
 				<version>${project.version}</version>
 				<scope>runtime</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.aries.jax.rs</groupId>
+				<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
+				<version>1.0.6</version>
+				<scope>runtime</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.aries.spifly</groupId>
 				<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
diff --git a/cdi-extension-mp-metrics/pom.xml b/cdi-extension-mp-metrics/pom.xml
index 335143d6..dadbe7e8 100644
--- a/cdi-extension-mp-metrics/pom.xml
+++ b/cdi-extension-mp-metrics/pom.xml
@@ -194,13 +194,6 @@
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.core</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries.jax.rs</groupId>
-			<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
-			<version>1.0.6</version>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
 
 </project>