You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/11/20 19:15:13 UTC
[aries-cdi] 02/03: just use the pom
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/dfaa604a2736d4f014066a522a28af25a9a504be
commit dfaa604a2736d4f014066a522a28af25a9a504be
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 14:04:46 2019 -0500
just use the pom
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-extender/bnd.bnd | 16 ----------------
cdi-extender/pom.xml | 8 ++++++++
cdi-extra/bnd.bnd | 16 ----------------
cdi-extra/pom.xml | 7 +++++++
.../aries/cdi/extra/propertytypes/package-info.java | 1 +
5 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/cdi-extender/bnd.bnd b/cdi-extender/bnd.bnd
deleted file mode 100644
index b11d838..0000000
--- a/cdi-extender/bnd.bnd
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
--cdiannotations:
--conditionalpackage: \
- org.apache.felix.utils.extender,\
- org.osgi.util.converter
\ No newline at end of file
diff --git a/cdi-extender/pom.xml b/cdi-extender/pom.xml
index 6418afc..2e94114 100644
--- a/cdi-extender/pom.xml
+++ b/cdi-extender/pom.xml
@@ -49,6 +49,14 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
+ <configuration>
+ <bnd><![CDATA[
+ -cdiannotations:
+ -conditionalpackage: \
+ org.apache.felix.utils.extender,\
+ org.osgi.util.converter
+ ]]></bnd>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/cdi-extra/bnd.bnd b/cdi-extra/bnd.bnd
deleted file mode 100644
index 7c53dfd..0000000
--- a/cdi-extra/bnd.bnd
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-Import-Package: javax.servlet;resolution:=optional, *
--cdiannotations:
--contract: JavaServlet;resolution:=optional
--exportcontents: ${packages;VERSIONED}
\ No newline at end of file
diff --git a/cdi-extra/pom.xml b/cdi-extra/pom.xml
index 826ccdb..ef3a350 100644
--- a/cdi-extra/pom.xml
+++ b/cdi-extra/pom.xml
@@ -51,6 +51,13 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
+ <configuration>
+ <bnd><![CDATA[
+ Import-Package: javax.servlet;resolution:=optional, *
+ -cdiannotations:
+ -contract: JavaServlet;resolution:=optional
+ ]]></bnd>
+ </configuration>
</plugin>
</plugins>
</build>
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 a7ccd37..8a49d03 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
@@ -14,5 +14,6 @@
* limitations under the License.
*/
+@org.osgi.annotation.bundle.Export
@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.aries.cdi.extra.propertytypes;
\ No newline at end of file