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:11 UTC
[aries-cdi] branch master updated (413cb2c -> e397a82)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git.
from 413cb2c enable, but don't specify a goal
new a721780 bnd 4.3.1
new dfaa604 just use the pom
new e397a82 let bnd generate service loader descriptor
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cdi-extender/bnd.bnd | 16 ----------------
cdi-extender/pom.xml | 8 ++++++++
.../org/apache/aries/cdi/container/package-info.java | 2 ++
.../javax.enterprise.inject.se.SeContainerInitializer | 13 -------------
.../services/javax.enterprise.inject.spi.CDIProvider | 13 -------------
cdi-extra/bnd.bnd | 16 ----------------
cdi-extra/pom.xml | 7 +++++++
.../aries/cdi/extra/propertytypes/package-info.java | 1 +
cdi-itests/itest.bndrun | 2 +-
pom.xml | 4 ++--
10 files changed, 21 insertions(+), 61 deletions(-)
delete mode 100644 cdi-extender/bnd.bnd
delete mode 100644 cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
delete mode 100644 cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
delete mode 100644 cdi-extra/bnd.bnd
[aries-cdi] 02/03: just use the pom
Posted by ro...@apache.org.
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
[aries-cdi] 01/03: bnd 4.3.1
Posted by ro...@apache.org.
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/a721780d04a287f1947f575b31f19612c68e6ef9
commit a721780d04a287f1947f575b31f19612c68e6ef9
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Mon Nov 18 22:56:51 2019 -0500
bnd 4.3.1
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-itests/itest.bndrun | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/itest.bndrun
index e34707c..5d12cdf 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/itest.bndrun
@@ -44,7 +44,7 @@
sun.misc
-runbundles: \
- biz.aQute.junit;version='[4.3.0,4.3.1)',\
+ biz.aQute.junit;version='[4.3.1,4.3.2)',\
javax.ejb-api;version='[3.2.0,3.2.1)',\
javax.transaction-api;version='[1.2.0,1.2.1)',\
jboss-classfilewriter;version='[1.2.3,1.2.4)',\
diff --git a/pom.xml b/pom.xml
index 59e9159..2d32411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<properties>
- <bnd.version>4.3.0</bnd.version>
+ <bnd.version>4.3.1</bnd.version>
<jsp.version>2.0</jsp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
@@ -347,7 +347,7 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
- <includeOptional>false</includeOptional>
+ <reportOptional>false</reportOptional>
</configuration>
<executions>
<execution>
[aries-cdi] 03/03: let bnd generate service loader descriptor
Posted by ro...@apache.org.
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/e397a826d387158fec95ed9a0da863a5ae6551b8
commit e397a826d387158fec95ed9a0da863a5ae6551b8
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 14:06:52 2019 -0500
let bnd generate service loader descriptor
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../java/org/apache/aries/cdi/container/package-info.java | 2 ++
.../javax.enterprise.inject.se.SeContainerInitializer | 13 -------------
.../services/javax.enterprise.inject.spi.CDIProvider | 13 -------------
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
index 4c7766e..fbc8be2 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
@@ -60,6 +60,7 @@
}
)
@Capability(
+ attribute = "register:=javax.enterprise.inject.se.SeContainerInitializer",
namespace = "osgi.serviceloader",
name = "javax.enterprise.inject.se.SeContainerInitializer",
uses = {
@@ -68,6 +69,7 @@
}
)
@Capability(
+ attribute = "register:=javax.enterprise.inject.spi.CDIProvider",
namespace = "osgi.serviceloader",
name = "javax.enterprise.inject.spi.CDIProvider",
uses = {
diff --git a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer b/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
deleted file mode 100644
index 01119f8..0000000
--- a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
+++ /dev/null
@@ -1,13 +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.
-
-org.apache.aries.cdi.container.internal.provider.SeContainerInitializer
\ No newline at end of file
diff --git a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider b/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
deleted file mode 100644
index 77348d0..0000000
--- a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
+++ /dev/null
@@ -1,13 +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.
-
-org.apache.aries.cdi.container.internal.provider.CDIProvider
\ No newline at end of file