(openwebbeans) 02/02: OWB-1434 upgrade some dependencies
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 8be024c7d66d12d44ab2b816aa51df69cf404373
Author: Mark Struberg
AuthorDate: Wed Nov 8 23:03:56 2023 +0100
OWB-1434 upgrade some dependencies
---
pom.xml | 44
1 file changed, 8 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb4df9fa1..661747dbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,22 +59,22 @@
-2.0.0
-4.0.0
+2.0.1
+4.0.1
2.0.0
-2.0.0
+2.1.1
4.0.0
-
2.0.0
-3.0.0
-4.0.0
+
2.0.1
+3.0.2
+4.0.1
3.0.0
10.1.5
-4.0.0-RC4
+4.0.1
4.5.14
4.24
-1.7.0.Alpha13
+1.7.1.Final
4.0.12
4.0
@@ -810,25 +810,6 @@
jakarta.ejb-api
${jakarta.ejb-api.version}
-
-org.apache.geronimo.specs
-geronimo-ejb_3.1_spec
-${geronimo_ejb.version}
-
-
-
-
-
-org.apache.geronimo.specs
-geronimo-jaxws_2.2_spec
-${geronimo_jaxws.version}
-
-
-
-org.apache.geronimo.specs
-geronimo-servlet_3.0_spec
-${geronimo_servlet.version}
-
org.apache.myfaces.core
@@ -877,15 +858,6 @@
provided
-
-
-
org.apache.openwebbeans
(openwebbeans) 01/02: OWB-1433 more plugin updates
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 26f97997d676be5d7d347bdcb05116e5e835ca9f
Author: Mark Struberg
AuthorDate: Wed Nov 8 20:32:54 2023 +0100
OWB-1433 more plugin updates
---
pom.xml | 44 +---
1 file changed, 13 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4ad87864..fb4df9fa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
9.4.12.v20180830
3.2.2
+3.1.1
@@ -403,7 +404,7 @@
org.apache.maven.plugins
maven-source-plugin
-3.0.0
+3.2.1
@@ -606,7 +607,7 @@
org.apache.rat
apache-rat-plugin
-0.11
+0.13
src/**/*
@@ -631,7 +632,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
-3.1.0
+3.4.1
enforce-java-version
@@ -652,7 +653,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.10.4
+${maven-javadoc.version}
true
-Xdoclint:none
@@ -674,7 +675,6 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
-2.9
@@ -692,7 +692,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.10.4
+${maven-javadoc.version}
true
-Xdoclint:none
@@ -948,7 +948,7 @@
org.apache.maven.plugins
maven-jxr-plugin
-2.5
+3.0.0
${project.build.sourceEncoding}
@@ -961,21 +961,21 @@
org.apache.maven.plugins
maven-pmd-plugin
-3.6
+3.21.2
-1.5
+11
+
org.apache.maven.plugins
-
-maven-project-info-reports-plugin
-
+
maven-project-info-reports-plugin
2.9
@@ -999,7 +999,7 @@
org.apache.maven.plugins
maven-surefire-report-plugin
-2.19.1
+3.0.0-M4
@@ -1008,24 +1008,6 @@
-
-org.codehaus.mojo
-cobertura-maven-plugin
-2.6
-
-
-org.codehaus.mojo
-taglist-maven-plugin
-2.4
-
-
-org.codehaus.mojo
-findbugs-maven-plugin
-3.0.3
-
-Low
-
-
(openwebbeans) branch main updated (7fbe82ddc -> 8be024c7d)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git from 7fbe82ddc OWB-1433 some maven upgrades and min java11 new 26f97997d OWB-1433 more plugin updates new 8be024c7d OWB-1434 upgrade some dependencies The 2 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: pom.xml | 88 - 1 file changed, 21 insertions(+), 67 deletions(-)
(openwebbeans) branch main updated: OWB-1433 some maven upgrades and min java11
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new 7fbe82ddc OWB-1433 some maven upgrades and min java11
7fbe82ddc is described below
commit 7fbe82ddcfbd7929c887b9342ee4d46b7c56cb28
Author: Mark Struberg
AuthorDate: Wed Nov 8 18:22:18 2023 +0100
OWB-1433 some maven upgrades and min java11
---
pom.xml | 13 +++--
.../org/apache/webbeans/inject/instance/InstanceImpl.java | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6da990850..a4ad87864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@
9.4.12.v20180830
+3.2.2
@@ -300,7 +301,7 @@
org.apache.maven.plugins
maven-jar-plugin
-2.6
+3.2.0
@@ -380,16 +381,15 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.5.1
+3.8.1
-1.8
-1.8
+11
+11
org.apache.maven.plugins
maven-surefire-plugin
-3.2.2
**/*Test.java
@@ -416,7 +416,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-2.17
+3.1.0
verify-style
@@ -538,6 +538,7 @@
+
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
index 73a7075f6..3041db52d 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
@@ -256,7 +256,8 @@ public class InstanceImpl implements Instance,
Serializable
public Iterator iterator()
{
final Iterator> beans = resolveBeans().iterator();
-return new Iterator() {
+return new Iterator()
+{
@Override
public boolean hasNext()
{
(openwebbeans) branch main updated: [upgrade] move to surefire 3.2.2
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new 76f696ae2 [upgrade] move to surefire 3.2.2
76f696ae2 is described below
commit 76f696ae29cda9f03f73756fcdf28bfb020835e7
Author: Romain Manni-Bucau
AuthorDate: Wed Nov 8 18:04:27 2023 +0100
[upgrade] move to surefire 3.2.2
---
pom.xml| 2 +-
webbeans-junit5/pom.xml| 3 +++
.../apache/openwebbeans/junit5/{reusable => }/CdiWithOnStartTest.java | 3 +--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 64ec4d830..6da990850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,7 +389,7 @@
org.apache.maven.plugins
maven-surefire-plugin
-3.0.0-M4
+3.2.2
**/*Test.java
diff --git a/webbeans-junit5/pom.xml b/webbeans-junit5/pom.xml
index 4fe91963e..c78e6a0db 100644
--- a/webbeans-junit5/pom.xml
+++ b/webbeans-junit5/pom.xml
@@ -92,6 +92,9 @@
+
+true
+
diff --git
a/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/reusable/CdiWithOnStartTest.java
b/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/CdiWithOnStartTest.java
similarity index 94%
rename from
webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/reusable/CdiWithOnStartTest.java
rename to
webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/CdiWithOnStartTest.java
index fabeeb35f..2b824bd95 100644
---
a/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/reusable/CdiWithOnStartTest.java
+++
b/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/CdiWithOnStartTest.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openwebbeans.junit5.reusable;
+package org.apache.openwebbeans.junit5;
-import org.apache.openwebbeans.junit5.Cdi;
import org.junit.jupiter.api.Test;
import java.io.Closeable;
(openwebbeans) branch main updated: exclude test which breaks with Java21
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git The following commit(s) were added to refs/heads/main by this push: new 7b19a0db0 exclude test which breaks with Java21 7b19a0db0 is described below commit 7b19a0db05465ca3a5e4e19a2615e1727e554393 Author: Mark Struberg AuthorDate: Wed Nov 8 15:37:39 2023 +0100 exclude test which breaks with Java21 See https://github.com/jakartaee/cdi-tck/issues/485 --- webbeans-tck/standalone-suite.xml | 7 +++ webbeans-tck/testng-dev.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 7367eca48..2702b00a2 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -239,6 +239,13 @@ + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 654cf0992..00a9c0fa9 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -19,7 +19,7 @@ - +
(openwebbeans) branch main updated: OWB-1429 upgrade to CDI-TCK-4.0.12
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git The following commit(s) were added to refs/heads/main by this push: new 8d628cecf OWB-1429 upgrade to CDI-TCK-4.0.12 8d628cecf is described below commit 8d628cecfc797fa1d8946238f1cfee152e81047e Author: Mark Struberg AuthorDate: Wed Nov 8 14:39:53 2023 +0100 OWB-1429 upgrade to CDI-TCK-4.0.12 --- pom.xml | 2 +- webbeans-tck/standalone-suite.xml | 14 ++ webbeans-tck/testng-dev.xml | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e6835c34c..64ec4d830 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 4.5.14 4.24 1.7.0.Alpha13 -4.0.9 +4.0.12 4.0 4.0 diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 048a7d6c8..7367eca48 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -226,6 +226,20 @@ + + + + + + + + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 2f9ab5201..654cf0992 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -19,9 +19,11 @@ - + +
(openwebbeans) 02/03: OWB-1431 upgrade xbean to 4.24
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit 64ff1e52d79987e88c5bf07019ef63b0dbc41a15 Author: Mark Struberg AuthorDate: Wed Nov 8 13:31:10 2023 +0100 OWB-1431 upgrade xbean to 4.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75f7a4115..e6835c34c 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.0.0-RC4 4.5.14 -4.22 +4.24 1.7.0.Alpha13 4.0.9
(openwebbeans) 01/03: OWB-1430 BeanContainer in BeanManagerBean
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 786bc69379034165cd939be9ea14919e34399578
Author: Mark Struberg
AuthorDate: Wed Nov 8 13:29:45 2023 +0100
OWB-1430 BeanContainer in BeanManagerBean
The BeanManagerBean must now also sattisfy the new BeanContainer interface
---
pom.xml | 2 +-
.../main/java/org/apache/webbeans/component/BeanManagerBean.java| 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76960e323..75f7a4115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
4.5.14
4.22
1.7.0.Alpha13
-4.0.7
+4.0.9
4.0
4.0
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
index d76c81f0c..4092047bc 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
@@ -18,8 +18,7 @@
*/
package org.apache.webbeans.component;
-import java.lang.reflect.Type;
-
+import jakarta.enterprise.inject.spi.BeanContainer;
import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.config.WebBeansContext;
@@ -33,7 +32,8 @@ public class BeanManagerBean extends
BuiltInOwbBean
{
super(webBeansContext,
WebBeansType.MANAGER,
- new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(BeanManager.class,
Object.class), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET),
+ new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(BeanManager.class,
BeanContainer.class, Object.class),
+
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET),
BeanManager.class,
new SimpleProducerFactory<>(new
BeanManagerProducer(webBeansContext)));
}
(openwebbeans) 03/03: OWB-1432 prevent ClassCastException
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 53aa4ef5abbda9747d577b392afb9d5c7a1a0803
Author: Mark Struberg
AuthorDate: Wed Nov 8 13:35:32 2023 +0100
OWB-1432 prevent ClassCastException
if a custon InjectionTarget is set, then it has to do all interceptor stuff
itself
as per the spec.
---
.../webbeans/container/ValidatingInjectionTargetFactory.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
index 3a51cb5d9..eb0e5cc3b 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
@@ -46,7 +46,7 @@ public class ValidatingInjectionTargetFactory extends
InjectionTargetFactoryI
public InjectionTarget createInjectionTarget(Bean bean)
{
final AnnotatedType annotatedType = getAnnotatedType();
-final InjectionTargetImpl injectionTarget =
(InjectionTargetImpl) super.createInjectionTarget(bean);
+final InjectionTarget injectionTarget =
super.createInjectionTarget(bean);
final Set injectionPoints =
injectionTarget.getInjectionPoints();
try
{
@@ -72,7 +72,10 @@ public class ValidatingInjectionTargetFactory extends
InjectionTargetFactoryI
});
}
-injectionTarget.defineInterceptorStack(bean, annotatedType,
getWebBeansContext());
+if (injectionTarget instanceof InjectionTargetImpl)
+{
+((InjectionTargetImpl)
injectionTarget).defineInterceptorStack(bean, annotatedType,
getWebBeansContext());
+}
}
return injectionTarget;
(openwebbeans) branch main updated (729be8217 -> 53aa4ef5a)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git from 729be8217 re-enable ASF header check new 786bc6937 OWB-1430 BeanContainer in BeanManagerBean new 64ff1e52d OWB-1431 upgrade xbean to 4.24 new 53aa4ef5a OWB-1432 prevent ClassCastException 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: pom.xml| 4 ++-- .../main/java/org/apache/webbeans/component/BeanManagerBean.java | 6 +++--- .../webbeans/container/ValidatingInjectionTargetFactory.java | 7 +-- 3 files changed, 10 insertions(+), 7 deletions(-)
