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 2022/04/03 02:43:13 UTC
[aries-cdi] branch master updated (7afe4ec -> 13357e8)
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 7afe4ec Bump apache from 24 to 25
new b58f5ed persist resolution results
new 75acd39 remove unused references
new 50c52d2 update to bnd 6.2.0
new 76c67ca Bump maven-scm-plugin from 1.11.2 to 1.12.2
new 78cb11d Bump org.eclipse.osgi from 3.17.0 to 3.17.200
new 144bec0 Bump mockito-core from 4.2.0 to 4.4.0
new 13357e8 update CI'd JDKs
The 7 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:
.github/workflows/maven.yml | 4 ++--
cdi-bom/pom.xml | 2 +-
cdi-executable/base.bndrun | 2 ++
cdi-executable/owb-executable.bndrun | 2 +-
cdi-executable/weld-executable.bndrun | 2 +-
cdi-extender/pom.xml | 4 ++--
.../cdi/container/internal/annotated/AnnotatedImpl.java | 2 --
.../container/internal/container/ContainerBootstrap.java | 2 +-
.../aries/cdi/container/internal/container/Discovery.java | 5 +++--
.../aries/cdi/container/internal/util/Annotates.java | 11 -----------
cdi-itests/base-itest.bndrun | 2 ++
cdi-itests/owb-itest.bndrun | 14 +++++++-------
cdi-itests/weld-itest.bndrun | 14 +++++++-------
pom.xml | 4 ++--
14 files changed, 31 insertions(+), 39 deletions(-)
[aries-cdi] 03/07: update to bnd 6.2.0
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
commit 50c52d2b0ede49049137ccd663291119e2c15ece
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Apr 1 22:17:26 2022 -0400
update to bnd 6.2.0
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/base.bndrun | 2 ++
cdi-extender/pom.xml | 2 +-
.../aries/cdi/container/internal/container/ContainerBootstrap.java | 2 +-
.../org/apache/aries/cdi/container/internal/container/Discovery.java | 5 +++--
cdi-itests/base-itest.bndrun | 2 ++
pom.xml | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index ddc61f0..b94c0b6 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -21,6 +21,8 @@
org.osgi.service.http.port=8080,\
osgi.console=
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
-runpath: \
diff --git a/cdi-extender/pom.xml b/cdi-extender/pom.xml
index c51eccc..53b74c0 100644
--- a/cdi-extender/pom.xml
+++ b/cdi-extender/pom.xml
@@ -53,7 +53,7 @@
<bnd><![CDATA[
-cdiannotations:
-conditionalpackage: \
- aQute.lib.exceptions,\
+ aQute.bnd.exceptions,\
org.apache.felix.utils.extender
]]></bnd>
</configuration>
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
index fa2db8c..2872760 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
@@ -14,7 +14,7 @@
package org.apache.aries.cdi.container.internal.container;
-import static aQute.lib.exceptions.FunctionWithException.asFunction;
+import static aQute.bnd.exceptions.FunctionWithException.asFunction;
import static java.util.Objects.requireNonNull;
import static java.util.Optional.ofNullable;
import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
index 4202f5f..42a0572 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
@@ -14,6 +14,7 @@
package org.apache.aries.cdi.container.internal.container;
+import static aQute.bnd.exceptions.Exceptions.duck;
import static java.util.stream.Collectors.toList;
import java.io.InputStream;
@@ -88,7 +89,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import aQute.lib.exceptions.Exceptions;
+import aQute.bnd.exceptions.Exceptions;
public class Discovery {
@@ -109,7 +110,7 @@ public class Discovery {
trimExpression = xPath.compile("boolean(/beans/trim)");
excludeExpression = xPath.compile("/beans/scan/exclude");
} catch (Throwable t) {
- throw Exceptions.duck(t);
+ throw duck(t);
}
}
}
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index 15c3dca..a52610b 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -24,6 +24,8 @@
test.property.b=,\
org.apache.felix.http.host=localhost
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
-runpath: \
diff --git a/pom.xml b/pom.xml
index 65e3dfe..c4de927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<project.build.outputTimestamp>1</project.build.outputTimestamp>
<!-- Versions -->
- <bnd.version>5.3.0</bnd.version>
+ <bnd.version>6.2.0</bnd.version>
<byte.buddy.version>1.12.8</byte.buddy.version>
<jax.rs.whiteboard.version>2.0.0</jax.rs.whiteboard.version>
<jaxb.api.version>2.3.2</jaxb.api.version>
[aries-cdi] 04/07: Bump maven-scm-plugin from 1.11.2 to 1.12.2
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
commit 76c67cab5697705a6a8e530f9a915e3f62ea51a5
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 17 20:15:24 2022 +0000
Bump maven-scm-plugin from 1.11.2 to 1.12.2
Bumps [maven-scm-plugin](https://github.com/apache/maven-scm) from 1.11.2 to 1.12.2.
- [Release notes](https://github.com/apache/maven-scm/releases)
- [Commits](https://github.com/apache/maven-scm/compare/maven-scm-1.11.2...maven-scm-1.12.2)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-scm-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c4de927..7824d72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,7 +502,7 @@
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.11.2</version>
+ <version>1.12.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
[aries-cdi] 05/07: Bump org.eclipse.osgi from 3.17.0 to 3.17.200
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
commit 78cb11dc121559984df36a9a3f6f54c3e882bd36
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Mar 23 22:03:53 2022 +0000
Bump org.eclipse.osgi from 3.17.0 to 3.17.200
Bumps org.eclipse.osgi from 3.17.0 to 3.17.200.
---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
cdi-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 6577273..d3d75c3 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -206,7 +206,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.17.0</version>
+ <version>3.17.200</version>
<scope>runtime</scope>
</dependency>
<dependency>
[aries-cdi] 02/07: remove unused references
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
commit 75acd39ec1ba86b82b3933f6f7581f36f338dcbd
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Apr 1 22:06:08 2022 -0400
remove unused references
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../aries/cdi/container/internal/annotated/AnnotatedImpl.java | 2 --
.../apache/aries/cdi/container/internal/util/Annotates.java | 11 -----------
2 files changed, 13 deletions(-)
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedImpl.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedImpl.java
index f7c498b..6eaa12c 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedImpl.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedImpl.java
@@ -23,8 +23,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.spi.Annotated;
-
import org.apache.aries.cdi.container.internal.util.Reflection;
public class AnnotatedImpl<X> implements CachingAnnotated {
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
index 3911dd7..b847079 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
@@ -191,17 +191,6 @@ public class Annotates {
.collect(toList());
}
- private static List<Annotation> inherit(Collection<Annotation> annotations) {
- List<Annotation> list = new ArrayList<>();
- for (Annotation a1 : annotations) {
- for (Annotation a2 : collect(Arrays.asList(a1.annotationType().getAnnotations()))) {
- if (list.contains(a2)) continue;
- list.add(a2);
- }
- }
- return list;
- }
-
public static List<Class<?>> serviceClasses(Annotated annotated) {
List<Class<?>> serviceTypes = new ArrayList<>();
[aries-cdi] 06/07: Bump mockito-core from 4.2.0 to 4.4.0
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
commit 144bec07a3ab89660f3246d3dbe931c3f6b1267b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 28 20:25:37 2022 +0000
Bump mockito-core from 4.2.0 to 4.4.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 4.2.0 to 4.4.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.2.0...v4.4.0)
---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
cdi-extender/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cdi-extender/pom.xml b/cdi-extender/pom.xml
index 53b74c0..f48f7e5 100644
--- a/cdi-extender/pom.xml
+++ b/cdi-extender/pom.xml
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.2.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
[aries-cdi] 01/07: persist resolution results
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
commit b58f5edb2a44868a08a9006301f12fd558ed31e6
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Apr 1 22:05:56 2022 -0400
persist resolution results
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/owb-executable.bndrun | 2 +-
cdi-executable/weld-executable.bndrun | 2 +-
cdi-itests/owb-itest.bndrun | 14 +++++++-------
cdi-itests/weld-itest.bndrun | 14 +++++++-------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index e2fecee..ea03c32 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -43,4 +43,4 @@
org.apache.xbean.finder-shaded;version='[4.18.0,4.18.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.1.1,1.1.2)'
+ org.osgi.util.promise;version='[1.2.0,1.2.1)'
diff --git a/cdi-executable/weld-executable.bndrun b/cdi-executable/weld-executable.bndrun
index a79107d..91bccbf 100644
--- a/cdi-executable/weld-executable.bndrun
+++ b/cdi-executable/weld-executable.bndrun
@@ -54,4 +54,4 @@ _java.opens: "--add-opens", "java.base/java.lang=ALL-UNNAMED"
org.jboss.weld.osgi-bundle;version='[3.1.8,3.1.9)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.1.1,1.1.2)'
+ org.osgi.util.promise;version='[1.2.0,1.2.1)'
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 5159dae..c644cf3 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -24,12 +24,12 @@
com.sun.xml.bind.jaxb-impl;version='[2.3.2,2.3.3)',\
javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
jcl.over.slf4j;version='[1.7.32,1.7.33)',\
- junit-jupiter-api;version='[5.8.1,5.8.2)',\
- junit-jupiter-engine;version='[5.8.1,5.8.2)',\
- junit-jupiter-params;version='[5.8.1,5.8.2)',\
- junit-platform-commons;version='[1.8.1,1.8.2)',\
- junit-platform-engine;version='[1.8.1,1.8.2)',\
- junit-platform-launcher;version='[1.8.1,1.8.2)',\
+ junit-jupiter-api;version='[5.8.2,5.8.3)',\
+ junit-jupiter-engine;version='[5.8.2,5.8.3)',\
+ junit-jupiter-params;version='[5.8.2,5.8.3)',\
+ junit-platform-commons;version='[1.8.2,1.8.3)',\
+ junit-platform-engine;version='[1.8.2,1.8.3)',\
+ junit-platform-launcher;version='[1.8.2,1.8.3)',\
openwebbeans-impl;version='[2.0.25,2.0.26)',\
openwebbeans-spi;version='[2.0.25,2.0.26)',\
openwebbeans-web;version='[2.0.25,2.0.26)',\
@@ -80,5 +80,5 @@
org.osgi.test.common;version='[1.0.1,1.0.2)',\
org.osgi.test.junit5;version='[1.0.1,1.0.2)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.1.1,1.1.2)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 951a6df..8966934 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -38,12 +38,12 @@ _java.opens: "--add-opens", "java.base/java.lang=ALL-UNNAMED"
com.sun.xml.bind.jaxb-impl;version='[2.3.2,2.3.3)',\
jboss-classfilewriter;version='[1.2.5,1.2.6)',\
jcl.over.slf4j;version='[1.7.32,1.7.33)',\
- junit-jupiter-api;version='[5.8.1,5.8.2)',\
- junit-jupiter-engine;version='[5.8.1,5.8.2)',\
- junit-jupiter-params;version='[5.8.1,5.8.2)',\
- junit-platform-commons;version='[1.8.1,1.8.2)',\
- junit-platform-engine;version='[1.8.1,1.8.2)',\
- junit-platform-launcher;version='[1.8.1,1.8.2)',\
+ junit-jupiter-api;version='[5.8.2,5.8.3)',\
+ junit-jupiter-engine;version='[5.8.2,5.8.3)',\
+ junit-jupiter-params;version='[5.8.2,5.8.3)',\
+ junit-platform-commons;version='[1.8.2,1.8.3)',\
+ junit-platform-engine;version='[1.8.2,1.8.3)',\
+ junit-platform-launcher;version='[1.8.2,1.8.3)',\
org.apache.aries.cdi.extender;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.5,1.1.6)',\
org.apache.aries.cdi.extension.jndi;version='[1.1.5,1.1.6)',\
@@ -89,5 +89,5 @@ _java.opens: "--add-opens", "java.base/java.lang=ALL-UNNAMED"
org.osgi.test.common;version='[1.0.1,1.0.2)',\
org.osgi.test.junit5;version='[1.0.1,1.0.2)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.1.1,1.1.2)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
[aries-cdi] 07/07: update CI'd JDKs
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
commit 13357e86e7e8110daf1b21ed52c23358b0816e29
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Apr 1 22:31:53 2022 -0400
update CI'd JDKs
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.github/workflows/maven.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 210e95f..6815eac 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,11 +27,11 @@ jobs:
JDKxx_Matrix:
strategy:
matrix:
- java: [ 8, 11, 17, 18-ea ]
+ java: [ 8, 11, 17, 19-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest
- java: 8
+ java: 17
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps: