(openwebbeans) 01/02: OWB-1439 add jakarta api jars to scan exclude
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 2dc59ef8849dd2c15b593cd7deb60ff4b35eae0f Author: Mark Struberg AuthorDate: Tue Jun 4 14:50:50 2024 +0200 OWB-1439 add jakarta api jars to scan exclude --- .../main/resources/META-INF/openwebbeans/openwebbeans.properties | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index 0c93bd805..1ecf5fe18 100644 --- a/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -317,7 +317,14 @@ org.apache.webbeans.scanExclusionPaths=/jre/lib, \ /jackson-module-jaxb-annotations-, \ /jna-, \ /reactive-streams-, \ -/msg-simple- +/msg-simple-, \ +/jakarta.activation-api, \ +/jakarta.annotation-api, \ +/jakarta.el-api, \ +/jakarta.enterprise.cdi-api, \ +/jakarta.enterprise.lang-model, \ +/jakarta.inject-api, \ +/jakarta.interceptor-api
(openwebbeans) branch main updated (534536551 -> 70ee333b7)
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 534536551 missing @Override new 2dc59ef88 OWB-1439 add jakarta api jars to scan exclude new 70ee333b7 OWB-1440 improve ProcessAnnotatedType error logging 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: .../webbeans/portable/events/ProcessAnnotatedTypeImpl.java | 8 .../main/resources/META-INF/openwebbeans/openwebbeans.properties | 9 - 2 files changed, 16 insertions(+), 1 deletion(-)
(openwebbeans) 02/02: OWB-1440 improve ProcessAnnotatedType error logging
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 70ee333b77287ab3add4173d83010da2d64abd69
Author: Mark Struberg
AuthorDate: Tue Jun 4 14:54:59 2024 +0200
OWB-1440 improve ProcessAnnotatedType error logging
---
.../apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java | 8
1 file changed, 8 insertions(+)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
index acc0bd5d6..7bec30679 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
@@ -161,4 +161,12 @@ public class ProcessAnnotatedTypeImpl extends EventBase
implements ProcessAnn
modifiedAnnotatedType = false;
}
}
+
+@Override
+public String toString()
+{
+return "ProcessAnnotatedTypeImpl{" +
+"annotatedType=" + annotatedType.getJavaClass().getName() +
+'}';
+}
}
(openwebbeans) branch fb_cdicurrent_ip deleted (was 613f5e6c2)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch fb_cdicurrent_ip in repository https://gitbox.apache.org/repos/asf/openwebbeans.git was 613f5e6c2 OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get() This change permanently discards the following revisions: discard 613f5e6c2 OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get()
(openwebbeans) 01/01: OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get()
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch fb_cdicurrent_ip
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 613f5e6c2cb25f610d1fa0a288e044838680c5ce
Author: Mark Struberg
AuthorDate: Fri Feb 23 12:51:50 2024 +0100
OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get()
---
.../webbeans/inject/instance/InstanceImpl.java | 102 ++---
.../test/tests/InjectionPointInjectionTest.java| 5 +
2 files changed, 96 insertions(+), 11 deletions(-)
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 c4bb34882..ebaee034b 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
@@ -213,7 +213,7 @@ public class InstanceImpl implements Instance,
Serializable
qualifierAnnotations.toArray(new Annotation[0]) :
concatenateQualifiers(qualifiers);
return new InstanceImpl<>(
-injectionClazz, injectionPoint == null ? null : new
InstanceInjectionPoint(injectionPoint, newQualifiersArray),
+injectionClazz, injectionPoint == null ? null : new
DelegatingInjectionPoint(injectionPoint, newQualifiersArray),
webBeansContext, newQualifiersArray);
}
@@ -328,7 +328,13 @@ public class InstanceImpl implements Instance,
Serializable
BeanManagerImpl beanManager = webBeansContext.getBeanManagerImpl();
CreationalContextImpl creationalContext =
beanManager.createCreationalContext(bean);
-creationalContext.putInjectionPoint(injectionPoint);
+InjectionPoint ip = injectionPoint;
+if (ip == null)
+{
+// create a synthetic injection point to transport the type and
qualifier
+ip = new TypedInjectionPoint(injectionClazz,
bean.getQualifiers().toArray(new Annotation[bean.getQualifiers().size()]));
+}
+creationalContext.putInjectionPoint(ip);
try
{
T reference = (T) beanManager.getReference(bean, injectionClazz,
creationalContext);
@@ -400,27 +406,82 @@ public class InstanceImpl implements Instance,
Serializable
}
}
-private static class InstanceInjectionPoint implements InjectionPoint,
Serializable
+private static class TypedInjectionPoint extends InstanceInjectionPoint
{
-private InjectionPoint delegate;
-private Set qualifiers;
+private Type type;
-protected InstanceInjectionPoint(InjectionPoint injectionPoint,
Annotation[] newQualifiersArray)
+public TypedInjectionPoint(Type type, Annotation[] newQualifiersArray)
{
-this.delegate = injectionPoint;
-this.qualifiers = Collections.unmodifiableSet(new
HashSet<>(Arrays.asList(newQualifiersArray)));
+super(newQualifiersArray);
+this.type = type;
}
@Override
public Type getType()
{
-return delegate.getType();
+return type;
}
@Override
-public Set getQualifiers()
+public Bean getBean()
{
-return qualifiers;
+return null;
+}
+
+@Override
+public Member getMember()
+{
+return null;
+}
+
+@Override
+public Annotated getAnnotated()
+{
+return null;
+}
+
+@Override
+public boolean isDelegate()
+{
+return false;
+}
+
+@Override
+public boolean isTransient()
+{
+return false;
+}
+
+private void readObject(ObjectInputStream inp) throws IOException,
ClassNotFoundException
+{
+OwbCustomObjectInputStream owbCustomObjectInputStream = new
OwbCustomObjectInputStream(inp, WebBeansUtil.getCurrentClassLoader());
+qualifiers =
Set.class.cast(owbCustomObjectInputStream.readObject());
+type = Type.class.cast(owbCustomObjectInputStream.readObject());
+}
+
+private void writeObject(ObjectOutputStream op) throws IOException
+{
+ObjectOutputStream out = new ObjectOutputStream(op);
+out.writeObject(qualifiers);
+out.writeObject(type);
+}
+
+}
+
+private static class DelegatingInjectionPoint extends
InstanceInjectionPoint
+{
+private InjectionPoint delegate;
+
+protected DelegatingInjectionPoint(InjectionPoint injectionPoint,
Annotation[] newQualifiersArray)
+{
+super(newQualifiersArray);
+this.delegate = injectionPoint;
+}
+
+@Override
+public Type getType()
+{
+
(openwebbeans) branch fb_cdicurrent_ip created (now 613f5e6c2)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch fb_cdicurrent_ip in repository https://gitbox.apache.org/repos/asf/openwebbeans.git at 613f5e6c2 OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get() This branch includes the following new commits: new 613f5e6c2 OWB-1438 synthetic InjectionPoint for CDI.current().select(..).get() The 1 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.
svn commit: r67409 - /release/openwebbeans/4.0.2/
Author: struberg Date: Sun Feb 18 18:58:47 2024 New Revision: 67409 Log: add owb-4.0.2 release Added: release/openwebbeans/4.0.2/ release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip (with props) release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.asc (with props) release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.sha512 release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz (with props) release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.asc (with props) release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip (with props) release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip.asc (with props) release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip.sha512 Added: release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip -- svn:mime-type = application/zip Added: release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.asc == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.sha512 == --- release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.sha512 (added) +++ release/openwebbeans/4.0.2/openwebbeans-4.0.2-source-release.zip.sha512 Sun Feb 18 18:58:47 2024 @@ -0,0 +1 @@ +28199a1eaff15f3c5b9a6d11467eb595a3c9e78bfde5e9e624ed9e4031d48cb86546c88836f92ac0040f30261a3081a7fa543959ef1489061de31ef5f27fcc5f \ No newline at end of file Added: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz -- svn:mime-type = application/x-gzip Added: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.asc == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 == --- release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 (added) +++ release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 Sun Feb 18 18:58:47 2024 @@ -0,0 +1,17 @@ + + +404 - Path /org/apache/openwebbeans/openwebbeans-distribution/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 not found in group repository Public Repositories [id=public]. + + +https://repository.apache.org/favicon.png;> + + +https://repository.apache.org/static/css/Sonatype-content.css?2.14.20-02; type="text/css" media="screen" title="no title" charset="utf-8"> + + +404 - Path /org/apache/openwebbeans/openwebbeans-distribution/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 not found in group repository Public Repositories [id=public]. +Path /org/apache/openwebbeans/openwebbeans-distribution/4.0.2/openwebbeans-distribution-4.0.2-binary.tar.gz.sha512 not found in group repository Public Repositories [id=public]. + + Added: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip -- svn:mime-type = application/zip Added: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip.asc == Binary file - no diff available. Propchange: release/openwebbeans/4.0.2/openwebbeans-distribution-4.0.2-binary.zip.asc --
(openwebbeans) annotated tag openwebbeans-4.0.2 created (now 8e66b17bb)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to annotated tag openwebbeans-4.0.2 in repository https://gitbox.apache.org/repos/asf/openwebbeans.git at 8e66b17bb (tag) tagging 44eac7ee246db0f90dcbe68f545620be4e38099a (commit) replaces openwebbeans-4.0.1 by Mark Struberg on Mon Jan 29 09:55:40 2024 +0100 - Log - [maven-release-plugin] copy for tag openwebbeans-4.0.2 --- No new revisions were added by this update.
(openwebbeans) 02/03: [maven-release-plugin] prepare release openwebbeans-4.0.2
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 44eac7ee246db0f90dcbe68f545620be4e38099a Author: Mark Struberg AuthorDate: Mon Jan 29 09:55:40 2024 +0100 [maven-release-plugin] prepare release openwebbeans-4.0.2 --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 1cd30e1c4..30fb7781f 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.2-SNAPSHOT +4.0.2 ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index f9978afe9..83351ab1b 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.2-SNAPSHOT +4.0.2 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index b8ff73dfe..dea64e93d 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.2-SNAPSHOT +4.0.2 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index d4e7f596a..0433839bf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.2-SNAPSHOT +4.0.2 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 58a886e72..da5d64b13 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.2-SNAPSHOT +4.0.2 ../pom.xml diff --git a/pom.xml b/pom.xml index 7d731b901..df9d62a59 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.2-SNAPSHOT +4.0.2 openwebbeans.apache.org @@ -50,7 +50,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - HEAD + openwebbeans-4.0.2 diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index 3622491a5..b4e352331 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans.arquillian owb-arquillian-parent -4.0.2-SNAPSHOT +4.0.2 owb-arquillian-standalone diff --git a/webbeans-arquillian/pom.xml b/webbeans-arquillian/pom.xml index b5fa9a497..b1face1fc 100644 --- a/webbeans-arquillian/pom.xml +++ b/webbeans-arquillian/pom.xml @@ -22,7 +22,7 @@ org.apache.openwebbeans openwebbeans -4.0.2-SNAPSHOT +4.0.2 org.apache.openwebbeans.arquillian owb-arquillian-parent diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml index 6ff3014f6..622f0fda7 100644 --- a/webbeans-ee-common/pom.xml +++ b/webbeans-ee-common/pom.xml @@ -20,7 +20,7 @@ org.apache.openwebbeans openwebbeans -4.0.2-SNAPSHOT +4.0.2
(openwebbeans) 01/03: adopt to new apache-parent-31
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 0960b1651ae7bd7360c020f1ddc2a22ab3acf0ab
Author: Mark Struberg
AuthorDate: Mon Jan 29 09:27:58 2024 +0100
adopt to new apache-parent-31
---
pom.xml | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6fb32064a..7d731b901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,10 @@
+11
+11
+
${maven.compiler.source}
+
2.0.1
4.0.1
2.1.0
@@ -81,7 +85,6 @@
4.0
4.0
-
3.2.4
@@ -407,8 +410,9 @@
3.3.0
+attach-sources
-jar
+jar-no-fork
(openwebbeans) 03/03: [maven-release-plugin] prepare for next development iteration
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 8971072c6eac9037d2a4c8bc86b1fd0ac07bae20 Author: Mark Struberg AuthorDate: Mon Jan 29 09:55:40 2024 +0100 [maven-release-plugin] prepare for next development iteration --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 30fb7781f..0858d5ab9 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.2 +4.0.3-SNAPSHOT ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index 83351ab1b..170e641b9 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.2 +4.0.3-SNAPSHOT 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index dea64e93d..764038bb2 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.2 +4.0.3-SNAPSHOT 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 0433839bf..3aa3ea5db 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.2 +4.0.3-SNAPSHOT 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index da5d64b13..acae3555a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.2 +4.0.3-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index df9d62a59..c96d382ac 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.2 +4.0.3-SNAPSHOT openwebbeans.apache.org @@ -50,7 +50,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - openwebbeans-4.0.2 + HEAD diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index b4e352331..3b1ab4fb4 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans.arquillian owb-arquillian-parent -4.0.2 +4.0.3-SNAPSHOT owb-arquillian-standalone diff --git a/webbeans-arquillian/pom.xml b/webbeans-arquillian/pom.xml index b1face1fc..e5a4a75b6 100644 --- a/webbeans-arquillian/pom.xml +++ b/webbeans-arquillian/pom.xml @@ -22,7 +22,7 @@ org.apache.openwebbeans openwebbeans -4.0.2 +4.0.3-SNAPSHOT org.apache.openwebbeans.arquillian owb-arquillian-parent diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml index 622f0fda7..7fc41b0a2 100644 --- a/webbeans-ee-common/pom.xml +++ b/webbeans-ee-common/pom.xml @@ -20,7 +20,7 @@ org.apache.openwebbeans openwebbeans -4.0.2 +4.0.3-SNAPSHOT
(openwebbeans) branch main updated (c4186b0fa -> 8971072c6)
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 c4186b0fa Merge pull request #85 from apache/dependabot/maven/org.apache.rat-apache-rat-plugin-0.16.1 new 0960b1651 adopt to new apache-parent-31 new 44eac7ee2 [maven-release-plugin] prepare release openwebbeans-4.0.2 new 8971072c6 [maven-release-plugin] prepare for next development iteration 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: atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 10 +++--- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 31 insertions(+), 27 deletions(-)
(openwebbeans) branch main updated: update release notes for owb-4.0.2 release
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 2b7286f0e update release notes for owb-4.0.2 release 2b7286f0e is described below commit 2b7286f0e6c73407df411e328a888c4baaffe785 Author: Mark Struberg AuthorDate: Mon Jan 29 08:21:01 2024 +0100 update release notes for owb-4.0.2 release --- readme/README.txt | 12 1 file changed, 12 insertions(+) diff --git a/readme/README.txt b/readme/README.txt index 37bab19a9..45f275073 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -63,6 +63,18 @@ for the whole Application. +--- +Release Notes - OpenWebBeans - Version 4.0.2 +--- + +Bug +[OWB-1436] - org.apache.webbeans.el22.WrappedValueExpressionNode'does not have the property 'xxx' +[OWB-1437] - InstanceImpl#destroy might lead to a NPE + +Improvement +[OWB-1434] - upgrade various dependencies to more recent versions + + --- Release Notes - OpenWebBeans - Version 4.0.1 ---
(openwebbeans) annotated tag openwebbeans-4.0.1 created (now f2ed4314d)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to annotated tag openwebbeans-4.0.1 in repository https://gitbox.apache.org/repos/asf/openwebbeans.git at f2ed4314d (tag) tagging 761a8e92be46e2c3f40045ee52c166493a8d162f (commit) replaces openwebbeans-4.0.0 by Mark Struberg on Sat Nov 11 19:25:37 2023 +0100 - Log - [maven-release-plugin] copy for tag openwebbeans-4.0.1 --- No new revisions were added by this update.
(openwebbeans) 01/02: [maven-release-plugin] prepare release openwebbeans-4.0.1
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 761a8e92be46e2c3f40045ee52c166493a8d162f Author: Mark Struberg AuthorDate: Sat Nov 11 19:25:37 2023 +0100 [maven-release-plugin] prepare release openwebbeans-4.0.1 --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 10 +- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 3a82b30b1..8d079ec5f 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.1-SNAPSHOT +4.0.1 ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index a5b941f78..64561bcad 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.1-SNAPSHOT +4.0.1 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index 46118550b..a18e67edd 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.1-SNAPSHOT +4.0.1 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index ddfd80762..078a87740 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.1-SNAPSHOT +4.0.1 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index eb8e3d9f5..ddde0d2bc 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.1-SNAPSHOT +4.0.1 ../pom.xml diff --git a/pom.xml b/pom.xml index d267e4c5a..2ab129014 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.1-SNAPSHOT +4.0.1 openwebbeans.apache.org @@ -50,7 +50,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - HEAD + openwebbeans-4.0.1 @@ -444,8 +444,8 @@ - + @@ -539,7 +539,7 @@ - + diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index 02552bfcd..c1b71a9a6 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans.arquillian owb-arquillian-parent -4.0.1-SNAPSHOT +4.0.1
(openwebbeans) 02/02: [maven-release-plugin] prepare for next development iteration
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 008b1e3dba8cbcf9a52e437acbc7a72f78ceb938 Author: Mark Struberg AuthorDate: Sat Nov 11 19:25:38 2023 +0100 [maven-release-plugin] prepare for next development iteration --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 8d079ec5f..2a9e78130 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.1 +4.0.2-SNAPSHOT ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index 64561bcad..f9978afe9 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.1 +4.0.2-SNAPSHOT 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index a18e67edd..b8ff73dfe 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.1 +4.0.2-SNAPSHOT 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 078a87740..d4e7f596a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.1 +4.0.2-SNAPSHOT 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index ddde0d2bc..f5b898b26 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.1 +4.0.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 2ab129014..1707105c8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.1 +4.0.2-SNAPSHOT openwebbeans.apache.org @@ -50,7 +50,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - openwebbeans-4.0.1 + HEAD diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index c1b71a9a6..3622491a5 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans.arquillian owb-arquillian-parent -4.0.1 +4.0.2-SNAPSHOT owb-arquillian-standalone diff --git a/webbeans-arquillian/pom.xml b/webbeans-arquillian/pom.xml index 7ad0afe4d..b5fa9a497 100644 --- a/webbeans-arquillian/pom.xml +++ b/webbeans-arquillian/pom.xml @@ -22,7 +22,7 @@ org.apache.openwebbeans openwebbeans -4.0.1 +4.0.2-SNAPSHOT org.apache.openwebbeans.arquillian owb-arquillian-parent diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml index 9a40d1a46..6ff3014f6 100644 --- a/webbeans-ee-common/pom.xml +++ b/webbeans-ee-common/pom.xml @@ -20,7 +20,7 @@ org.apache.openwebbeans openwebbeans -4.0.1 +4.0.2-SNAPSHOT
(openwebbeans) branch main updated (579947b8f -> 008b1e3db)
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 579947b8f update release notes new 761a8e92b [maven-release-plugin] prepare release openwebbeans-4.0.1 new 008b1e3db [maven-release-plugin] prepare for next development iteration 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: atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 8 webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-)
(openwebbeans) 01/02: OWB-1435 fix javadoc plugin config
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 86ccdad02ee0f99084fe4987657612253b6b4508
Author: Mark Struberg
AuthorDate: Sat Nov 11 19:20:55 2023 +0100
OWB-1435 fix javadoc plugin config
---
pom.xml | 22 +-
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5edd1328d..d267e4c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
9.4.12.v20180830
3.2.2
-3.1.1
+3.5.0
@@ -656,14 +656,8 @@
${maven-javadoc.version}
true
--Xdoclint:none
-8
-
-http://download.oracle.com/javaee/7/api/
-
http://download.oracle.com/javase/8/docs/api/
-
http://myfaces.apache.org/core22/myfaces-api/apidocs/
-http://docs.oracle.com/javase/8/docs/api/
-
+11
+none
@@ -695,14 +689,8 @@
${maven-javadoc.version}
true
--Xdoclint:none
-8
-
-http://download.oracle.com/javaee/7/api/
-
http://download.oracle.com/javase/8/docs/api/
-
http://myfaces.apache.org/core22/myfaces-api/apidocs/
-http://docs.oracle.com/javase/8/docs/api/
-
+11
+none
(openwebbeans) branch main updated (2c14e7021 -> 579947b8f)
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 2c14e7021 OWB-1435 upgrade to apache parent 30 new 86ccdad02 OWB-1435 fix javadoc plugin config new 579947b8f update release notes 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 | 22 +- readme/README.txt | 3 ++- 2 files changed, 7 insertions(+), 18 deletions(-)
(openwebbeans) 02/02: update release notes
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 579947b8f911bccde84b134ca5fec02c656f5450 Author: Mark Struberg AuthorDate: Sat Nov 11 19:21:56 2023 +0100 update release notes --- readme/README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme/README.txt b/readme/README.txt index 2cb4e6f0c..37bab19a9 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -72,7 +72,8 @@ Improvement [OWB-1432] - ClassCastException in ValidatingInjectionTargetFactory [OWB-1433] - upgrade maven plugins and set Java version to 11 [OWB-1434] - upgrade various dependencies to more recent versions - +[OWB-1435] - upgrade to apache parent 30 + --- Release Notes - OpenWebBeans - Version 4.0.0
(openwebbeans) branch main updated: OWB-1435 upgrade to apache parent 30
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 2c14e7021 OWB-1435 upgrade to apache parent 30 2c14e7021 is described below commit 2c14e7021023a554912e02fefcfaf9859e7f6382 Author: Mark Struberg AuthorDate: Sat Nov 11 18:55:47 2023 +0100 OWB-1435 upgrade to apache parent 30 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 661747dbb..5edd1328d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache -29 +30
(openwebbeans) branch main updated: add release notes for 4.0.1
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 7ecf95101 add release notes for 4.0.1 7ecf95101 is described below commit 7ecf951016180d22ce4d9e54d5acba8210d2a52c Author: Mark Struberg AuthorDate: Sat Nov 11 17:10:40 2023 +0100 add release notes for 4.0.1 --- readme/README.txt | 11 +++ 1 file changed, 11 insertions(+) diff --git a/readme/README.txt b/readme/README.txt index 835a7b689..2cb4e6f0c 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -63,6 +63,17 @@ for the whole Application. +--- +Release Notes - OpenWebBeans - Version 4.0.1 +--- +Improvement +[OWB-1430] - BeanManagerBean should implement BeanContainer +[OWB-1431] - upgrade xbean to 4.24 +[OWB-1432] - ClassCastException in ValidatingInjectionTargetFactory +[OWB-1433] - upgrade maven plugins and set Java version to 11 +[OWB-1434] - upgrade various dependencies to more recent versions + + --- Release Notes - OpenWebBeans - Version 4.0.0 ---
(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: 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(-)
[openwebbeans] branch main updated: re-enable ASF header check
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 729be8217 re-enable ASF header check 729be8217 is described below commit 729be82171cddfbd55abb498ae3021fa59f96a3f Author: Mark Struberg AuthorDate: Tue Sep 19 10:51:23 2023 +0200 re-enable ASF header check but this time we do it inline. --- pom.xml| 13 +-- .../ValidatingInjectionTargetFactory.java | 26 -- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 22c81da48..76960e323 100644 --- a/pom.xml +++ b/pom.xml @@ -442,12 +442,10 @@ - @@ -602,15 +600,6 @@ true **/Unsafe* - 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 73e42b090..3a51cb5d9 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 @@ -1,18 +1,20 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 + * 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. + * 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.webbeans.container;
[openwebbeans] annotated tag openwebbeans-4.0.0 created (now 2d09199a8)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to annotated tag openwebbeans-4.0.0 in repository https://gitbox.apache.org/repos/asf/openwebbeans.git at 2d09199a8 (tag) tagging b578c40a9d710b9f9240a3dc3d670560e8527a09 (commit) replaces openwebbeans-2.0.27 by Mark Struberg on Mon Sep 4 12:34:32 2023 +0200 - Log - [maven-release-plugin] copy for tag openwebbeans-4.0.0 --- No new revisions were added by this update.
[openwebbeans] 01/02: [maven-release-plugin] prepare release openwebbeans-4.0.0
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 b578c40a9d710b9f9240a3dc3d670560e8527a09 Author: Mark Struberg AuthorDate: Mon Sep 4 12:34:32 2023 +0200 [maven-release-plugin] prepare release openwebbeans-4.0.0 --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml| 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml| 2 +- distribution/pom.xml | 2 +- pom.xml| 68 +++--- .../owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml| 2 +- webbeans-ee-common/pom.xml | 2 +- webbeans-ee/pom.xml| 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml| 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml| 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml| 2 +- webbeans-slf4j/pom.xml | 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml| 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 9847e747d..ed36d2e34 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.0-SNAPSHOT +4.0.0 ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index 08056bd72..a1fc47576 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.0-SNAPSHOT +4.0.0 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index de9cf434e..d27a5e18f 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.0-SNAPSHOT +4.0.0 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index bf0aacc41..a99a7cf33 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.0-SNAPSHOT +4.0.0 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index e8c3a1e88..e574e82f0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.0-SNAPSHOT +4.0.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 13da1d58b..0e70fd11b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.0-SNAPSHOT +4.0.0 openwebbeans.apache.org @@ -50,7 +50,8 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - + openwebbeans-4.0.0 + jira @@ -452,12 +453,12 @@ - + - + @@ -491,35 +492,34 @@ -name rules to vary by the type of the constant, and no other alternative seems -any better
[openwebbeans] 02/02: [maven-release-plugin] prepare for next development iteration
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 8bcade17a18887fe70dc4e9a9d8f87e993f4793d Author: Mark Struberg AuthorDate: Mon Sep 4 12:34:32 2023 +0200 [maven-release-plugin] prepare for next development iteration --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index ed36d2e34..3a82b30b1 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -4.0.0 +4.0.1-SNAPSHOT ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index a1fc47576..a5b941f78 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.0 +4.0.1-SNAPSHOT 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index d27a5e18f..46118550b 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -4.0.0 +4.0.1-SNAPSHOT 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index a99a7cf33..ddfd80762 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -4.0.0 +4.0.1-SNAPSHOT 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index e574e82f0..eb8e3d9f5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -4.0.0 +4.0.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 0e70fd11b..22c81da48 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -4.0.0 +4.0.1-SNAPSHOT openwebbeans.apache.org @@ -50,7 +50,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - openwebbeans-4.0.0 + HEAD diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index f60da356e..02552bfcd 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans.arquillian owb-arquillian-parent -4.0.0 +4.0.1-SNAPSHOT owb-arquillian-standalone diff --git a/webbeans-arquillian/pom.xml b/webbeans-arquillian/pom.xml index 76d4422ec..74ad962f7 100644 --- a/webbeans-arquillian/pom.xml +++ b/webbeans-arquillian/pom.xml @@ -22,7 +22,7 @@ org.apache.openwebbeans openwebbeans -4.0.0 +4.0.1-SNAPSHOT org.apache.openwebbeans.arquillian owb-arquillian-parent diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml index db2750799..edc1340e6 100644 --- a/webbeans-ee-common/pom.xml +++ b/webbeans-ee-common/pom.xml @@ -20,7 +20,7 @@ org.apache.openwebbeans openwebbeans -4.0.0 +4.0.1-SNAPSHOT
[openwebbeans] branch main updated (2df1d2132 -> 8bcade17a)
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 2df1d2132 OWB-1417 update readme for OWB-4.0.0 new b578c40a9 [maven-release-plugin] prepare release openwebbeans-4.0.0 new 8bcade17a [maven-release-plugin] prepare for next development iteration 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: atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml| 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml| 2 +- distribution/pom.xml | 2 +- pom.xml| 68 +++--- .../owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml| 2 +- webbeans-ee-common/pom.xml | 2 +- webbeans-ee/pom.xml| 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml| 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml| 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-se/pom.xml| 2 +- webbeans-slf4j/pom.xml | 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat/pom.xml| 2 +- webbeans-web/pom.xml | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-)
[openwebbeans] branch main updated: OWB-1417 update readme for OWB-4.0.0
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 2df1d2132 OWB-1417 update readme for OWB-4.0.0 2df1d2132 is described below commit 2df1d21327a09a091f5971b7ee85cf31ddfd44de Author: Mark Struberg AuthorDate: Mon Sep 4 12:33:13 2023 +0200 OWB-1417 update readme for OWB-4.0.0 --- readme/README.txt | 52 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/readme/README.txt b/readme/README.txt index 2a2f8abd5..835a7b689 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -4,25 +4,22 @@ Apache OpenWebBeans README Welcome! -Thanks for downloading and using Apache OpenWebBeans. -In short OWB -This document is a "Getting Started Guide" for the latest release OWB. +Thanks for downloading and using Apache OpenWebBeans (OWB). + +This document is a "Getting Started Guide" for the latest Apache OpenWebBeans release. What is Apache OpenWebBeans? -OpenWebBeans is an Apache License V 2.0 licensed implementation of the JSR-365, -Contexts and Dependency Injection 2.0 specification. +OpenWebBeans is an Apache License V 2.0 licensed implementation of the Jakarta Contexts and Dependency Injection 4.0 specification. -CDI-2.0 is backward compatible to JSR-346 CDI-1.2 and JSR-299 CDI-1.0. +CDI-4.0 is mostly backward compatible to JSR-365 CDI-2.0, JSR-346 CDI-1.2 and JSR-299 CDI-1.0 but uses the jakarta.* package names instead of javax.* Our project's web page can be found at: https://openwebbeans.apache.org -We also support the Jakarta EE specifications by providing shaded libraries. - -The latest Java Version we support is Java-16. -The minimum Java Version is Java-8. +The latest Java Version we support is Java-21. +The minimum Java Version is Java-11. @@ -46,8 +43,7 @@ OpenWebBeans Release Features * @Alternative support * OSGi environment support with an own plugable bundle ClassPath scanner * plugable SecurityManager integration doubles speed if no SecurityManager is being used -* support for direct CDI usage in tomcat-8, tomcat-9 and other Servlet environments - +* support for direct CDI usage in Tomcat and other Servlet environments Noteable differences to CDI spec behaviour @@ -65,6 +61,38 @@ of the Application. This is especially the case for , for the whole Application. + + +--- +Release Notes - OpenWebBeans - Version 4.0.0 +--- +Bug +[OWB-1368] - Maven artifacts with Jakarta classifier requires the artifacts without classifier +[OWB-1418] - @Priority on @Alternative @Stereotype enables the bean +[OWB-1423] - openwebbeans-impl-jakarta is using old javax namespace +[OWB-1425] - Interceptors not being called on UnmanagedInstance +[OWB-1426] - Missing bean types for indirectly implemented interfaces + +Epic +[OWB-1417] - Implement CDI-4.0 spec + +New Feature +[OWB-1427] - Support for dotted bean names with EL + +Improvement +[OWB-1428] - make default bean-discovery-mode configurable + +Task +[OWB-1088] - fix samples with java 8 and update to tomcat7/8 + +TCK Challenge +[OWB-1419] - org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct.ConstructorInterceptionTest +[OWB-1420] - org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.bindings.LifecycleInterceptorDefinitionTest +[OWB-1421] - org.jboss.cdi.tck.interceptors.tests.bindings.overriding.InterceptorBindingOverridingTest +[OWB-1422] - org.jboss.cdi.tck.tests.interceptors.definition.InterceptorDefinitionTest +[OWB-1424] - org.jboss.cdi.tck.tests.full.context.passivating.dependency.builtin.BuiltinBeanPassivationDependencyTestorg.jboss.cdi.tck.tests.full.context.passivating.dependency.builtin.BuiltinBeanPassivationDependencyTest + + --- Release Notes - OpenWebBeans - Version 2.0.25 ---
[openwebbeans] branch main updated: OWB-1425 interceptors for Unmanaged Instances
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 01245cf8e OWB-1425 interceptors for Unmanaged Instances
01245cf8e is described below
commit 01245cf8ef0baaa9cd31342b0cdb075d314b6ef9
Author: Mark Struberg
AuthorDate: Sat Feb 25 13:58:57 2023 +0100
OWB-1425 interceptors for Unmanaged Instances
---
.../apache/webbeans/container/BeanManagerImpl.java | 13 ++-
.../ValidatingInjectionTargetFactory.java | 25 --
webbeans-tck/standalone-suite.xml | 11 +-
webbeans-tck/testng-dev.xml| 4 ++--
4 files changed, 38 insertions(+), 15 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 945df6c7b..9cee6b006 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -187,6 +187,12 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
private AnnotatedElementFactory annotatedElementFactory;
+/**
+ * A cache for bean classes which get created 'on the fly' by manually
calling createInjectionTarget without a bean.
+ */
+private ConcurrentMap, Bean> unmanagedClassBeans = new
ConcurrentHashMap<>();
+
+
private final WebBeansContext webBeansContext;
/**
@@ -214,7 +220,7 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
* We don't need to take special care about classloader
* hierarchies, because each cl has other classes.
*/
-private static Map, Boolean>
isScopeTypeNormalCache =
+private Map, Boolean> isScopeTypeNormalCache =
new ConcurrentHashMap<>();
/**
@@ -258,6 +264,11 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
return errorStack;
}
+public ConcurrentMap, Bean> getUnmanagedClassBeans()
+{
+return unmanagedClassBeans;
+}
+
/**
* Gets injection resolver.
*
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 f87b4c114..73e42b090 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
@@ -17,12 +17,16 @@
package org.apache.webbeans.container;
import java.util.Set;
-
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.InjectionTarget;
+import org.apache.webbeans.component.BeanAttributesImpl;
+import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.component.creation.BeanAttributesBuilder;
+import org.apache.webbeans.component.creation.ManagedBeanBuilder;
import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.portable.InjectionTargetImpl;
/**
* InjectionTargetFactory which validates the craeted InjectionTarget.
@@ -39,7 +43,8 @@ public class ValidatingInjectionTargetFactory extends
InjectionTargetFactoryI
@Override
public InjectionTarget createInjectionTarget(Bean bean)
{
-final InjectionTarget injectionTarget =
super.createInjectionTarget(bean);
+final AnnotatedType annotatedType = getAnnotatedType();
+final InjectionTargetImpl injectionTarget =
(InjectionTargetImpl) super.createInjectionTarget(bean);
final Set injectionPoints =
injectionTarget.getInjectionPoints();
try
{
@@ -52,6 +57,22 @@ public class ValidatingInjectionTargetFactory extends
InjectionTargetFactoryI
throw new IllegalArgumentException("Problem while creating
InjectionTarget", e);
}
+// only possible to define an interceptor if there is a default ct
+if
(getWebBeansContext().getWebBeansUtil().getNoArgConstructor(annotatedType.getJavaClass())
!= null)
+{
+if (bean == null)
+{
+bean =
getWebBeansContext().getBeanManagerImpl().getUnmanagedClassBeans().computeIfAbsent(annotatedType.getJavaClass(),
c -> {
+final BeanAttributesImpl attributes =
BeanAttributesBuilder.forContext(getWebBeansContext()).newBeanAttibutes(annotatedType).build();
+ManagedBeanBuilder> managedBeanCreator
+= new ManagedBeanBuilder<>(getWebBea
[openwebbeans] branch main updated: OWB-1428 make default bean-discovery-mode configurable
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 f9a1dd7d0 OWB-1428 make default bean-discovery-mode configurable
f9a1dd7d0 is described below
commit f9a1dd7d01d593acce000c3414a766f40099a74d
Author: Mark Struberg
AuthorDate: Sat Feb 25 09:24:08 2023 +0100
OWB-1428 make default bean-discovery-mode configurable
There was a really problematic change in the CDI-4.0 specification which
will break many applications. They switched the bean-discovery-mode of an empty
beans.xml file (or a beans.xml without any version) from ALL to ANNOTATED
(Despite warnings that his is totally backward incompatible and could easily
have been avoided).
The default in OWB is still ALL, but it can be configured to any other
bean-discovery-mode with this config switch to pass this very TCK test.
---
.../org/apache/webbeans/config/BeansDeployer.java | 3 ++-
.../webbeans/config/OpenWebBeansConfiguration.java | 21 +
.../webbeans/xml/DefaultBeanArchiveService.java | 16 +++-
.../META-INF/openwebbeans/openwebbeans.properties | 10 ++
.../META-INF/openwebbeans/openwebbeans.properties | 4
webbeans-tck/standalone-suite.xml | 10 --
6 files changed, 52 insertions(+), 12 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
index 99e0e8371..33c1ad9a1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
@@ -196,7 +196,8 @@ public class BeansDeployer
skipNoClassDefFoundTriggers =
this.webBeansContext.getOpenWebBeansConfiguration().isSkipNoClassDefFoundErrorTriggers();
defaultBeanArchiveInformation = new
DefaultBeanArchiveInformation("default");
-
defaultBeanArchiveInformation.setBeanDiscoveryMode(BeanDiscoveryMode.ALL);
+
+
defaultBeanArchiveInformation.setBeanDiscoveryMode(webBeansContext.getOpenWebBeansConfiguration().getDefaultBeanDiscoveryMode());
}
/**
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
index d692e4296..a8c12b58e 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
+import org.apache.webbeans.spi.BeanArchiveService;
import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
@@ -205,6 +206,18 @@ public class OpenWebBeansConfiguration
public static final String GENERATOR_JAVA_VERSION =
"org.apache.webbeans.generator.javaVersion";
+/**
+ * Default bean discovery mode for empty beans.xml
+ * There was a really wicked change in the CDI-4.0 specification which
will break many applications.
+ * They switched the bean-discovery-mode of an empty beans.xml file (or a
beans.xml without any version)
+ * from ALL to ANNOTATED (Despite warnings that his is totally backward
incompatible and could easily have been avoided).
+ *
+ * The default in OWB is still ALL, but it can be configured to any other
bean-discovery-mode with this config switch
+ */
+public static final String DEFAULT_BEAN_DISCOVERY_MODE =
"org.apache.webbeans.defaultBeanDiscoveryMode";
+
+
+
/**Default configuration files*/
private static final String DEFAULT_CONFIG_PROPERTIES_NAME =
"META-INF/openwebbeans/openwebbeans.properties";
@@ -598,4 +611,12 @@ public class OpenWebBeansConfiguration
}
return proxyReservedPackages;
}
+
+/**
+ * @see #DEFAULT_BEAN_DISCOVERY_MODE
+ */
+public BeanArchiveService.BeanDiscoveryMode getDefaultBeanDiscoveryMode()
+{
+return
BeanArchiveService.BeanDiscoveryMode.valueOf(getProperty(OpenWebBeansConfiguration.DEFAULT_BEAN_DISCOVERY_MODE));
+}
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
b/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
index c5d12ba24..9404b1148 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
@@ -33,6 +33,7 @@ import java.util.logging.Level;
im
[openwebbeans] branch main updated: OWB-1417 re-enable bom and distributions
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 4a1a69029 OWB-1417 re-enable bom and distributions
4a1a69029 is described below
commit 4a1a69029c00214c04c8bbb4b8dd007c5744c343
Author: Mark Struberg
AuthorDate: Fri Jan 27 20:57:42 2023 +0100
OWB-1417 re-enable bom and distributions
---
bom/openwebbeans-se-bom/pom.xml | 10 +++---
bom/openwebbeans-web-bom/pom.xml | 12 +++
distribution/pom.xml | 27 +++-
distribution/src/assembly/dist-binary.xml | 14
pom.xml | 54 +--
webbeans-osgi/pom.xml | 11 ---
6 files changed, 47 insertions(+), 81 deletions(-)
diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml
index 2a453ead5..08056bd72 100644
--- a/bom/openwebbeans-se-bom/pom.xml
+++ b/bom/openwebbeans-se-bom/pom.xml
@@ -51,30 +51,29 @@
org.apache.openwebbeans
openwebbeans-spi
${project.version}
-jakarta
org.apache.openwebbeans
*
-org.apache.geronimo.specs
+jakarta.*
*
+
org.apache.openwebbeans
openwebbeans-impl
${project.version}
-jakarta
org.apache.openwebbeans
*
-org.apache.geronimo.specs
+jakarta.*
*
@@ -83,14 +82,13 @@
org.apache.openwebbeans
openwebbeans-se
${project.version}
-jakarta
org.apache.openwebbeans
*
-org.apache.geronimo.specs
+jakarta.*
*
diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml
index c2536d5e3..de9cf434e 100644
--- a/bom/openwebbeans-web-bom/pom.xml
+++ b/bom/openwebbeans-web-bom/pom.xml
@@ -37,14 +37,13 @@
org.apache.openwebbeans
openwebbeans-spi
${project.version}
- jakarta
org.apache.openwebbeans
*
- org.apache.geronimo.specs
+ jakarta.*
*
@@ -53,14 +52,13 @@
org.apache.openwebbeans
openwebbeans-impl
${project.version}
- jakarta
org.apache.openwebbeans
*
- org.apache.geronimo.specs
+ jakarta.*
*
@@ -69,14 +67,13 @@
org.apache.openwebbeans
openwebbeans-el22
${project.version}
- jakarta
org.apache.openwebbeans
*
- org.apache.geronimo.specs
+ jakarta.*
*
@@ -85,14 +82,13 @@
org.apache.openwebbeans
openwebbeans-web
${project.version}
- jakarta
org.apache.openwebbeans
*
- org.apache.geronimo.specs
+ jakarta.*
*
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2c4f41dd0..e8c3a1e88 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -117,25 +117,25 @@
+
+jakarta.annotation
+jakarta.annotation-api
+
jakarta.inject
jakarta.inject-api
-
-jakarta.enterprise
-jakarta.enterprise.cdi-api
-
-jakarta.interceptor
-jakarta.interceptor-api
+jakarta.enterprise
+jakarta.enterprise.cdi-api
-jakarta.annotation
-jakarta.annotation-api
+jakarta.interceptor
+jakarta.interceptor-api
-org.apache.geronimo.specs
-geronimo-el_2.2_spec
+jakarta.el
+jakarta.el-api
@@ -184,11 +184,6 @@
openwebbeans-el22
${project.version}
-
-${project.groupId}
-openwebbeans-resource
-${project.version}
-
${project.groupId}
openwebbeans-spi
@@ -201,7 +196,7 @@
${project.groupId
[openwebbeans] branch main updated: OWB-1417 upgrade owb-jsf plugin to jakarta.*
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 011021b91 OWB-1417 upgrade owb-jsf plugin to jakarta.*
011021b91 is described below
commit 011021b910ff620ef347bab8a3bda2770ba10862
Author: Mark Struberg
AuthorDate: Fri Jan 27 15:40:04 2023 +0100
OWB-1417 upgrade owb-jsf plugin to jakarta.*
---
pom.xml| 39 +--
readme/README_M4.txt | 2 +-
.../samples/conversation/ShoppingBean.java | 2 +-
.../src/main/webapp/WEB-INF/web.xml| 2 +-
.../org/apache/webbeans/sample/bean/LoginBean.java | 2 +-
.../apache/webbeans/sample/bean/LogoutBean.java| 2 +-
.../sample/conversation/ShoppingCardBean.java | 2 +-
.../webbeans/sample/guess/JSFNumberGuess.java | 4 +-
.../webbeans/sample/util/FacesMessageUtil.java | 6 +-
samples/guess/src/main/webapp/WEB-INF/web.xml | 4 +-
.../org/apache/webbeans/jsf2/HelloJsfBean.java | 6 +-
samples/jsf2sample/src/main/webapp/WEB-INF/web.xml | 4 +-
.../jsf2sample/src/main/webapp/conversation.xhtml | 2 +-
samples/jsf2sample/src/main/webapp/counter.xhtml | 2 +-
.../reservation/beans/admin/AdminListBean.java | 2 +-
.../reservation/beans/admin/AdminListUser.java | 2 +-
.../reservation/beans/user/UserListBean.java | 2 +-
.../beans/user/UserReservationBean.java| 4 +-
.../controller/user/UserController.java| 2 +-
.../reservation/model/ReservationModel.java| 2 +-
.../security/JSFSecurityPhaseListener.java | 8 +-
.../webbeans/reservation/util/JSFUtility.java | 6 +-
.../reservation/src/main/webapp/WEB-INF/web.xml| 4 +-
webbeans-jsf/pom.xml | 56 ++--
.../webbeans/jsf/ConversationAwareViewHandler.java | 6 +-
.../main/java/org/apache/webbeans/jsf/JSFUtil.java | 6 +-
.../org/apache/webbeans/jsf/OwbApplication.java| 6 +-
.../apache/webbeans/jsf/OwbApplicationFactory.java | 6 +-
.../apache/webbeans/jsf/OwbExceptionHandler.java | 10 +-
.../webbeans/jsf/OwbExceptionHandlerFactory.java | 4 +-
webbeans-porting/pom.xml | 2 +-
webbeans-tck-jakarta/dev-suite.xml | 39 ---
webbeans-tck-jakarta/pom.xml | 363 -
.../META-INF/openwebbeans/openwebbeans.properties | 47 ---
.../src/test/resources/META-INF/cdi-tck.properties | 25 --
webbeans-tck-jakarta/standalone-suite.xml | 166 --
36 files changed, 87 insertions(+), 760 deletions(-)
diff --git a/pom.xml b/pom.xml
index 41e3f458a..1bc875b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,24 +52,6 @@
https://github.com/apache/openwebbeans
-
-
jira
https://issues.apache.org/jira/browse/OWB
@@ -87,23 +69,15 @@
3.0.0
10.1.5
-
+4.0.0-RC4
4.5.14
4.22
1.7.0.Alpha13
-1.2
-1.0
-1.0.2
-1.1
-1.1.1
-1.0.1
-1.1
9.4.12.v20180830
-2.3.6
4.0.7
2.4
@@ -111,9 +85,6 @@
2.0
3.2.4
-
-
-false
@@ -770,12 +741,11 @@
webbeans-ee
webbeans-jms
webbeans-tck
+webbeans-jsf
@@ -868,11 +838,6 @@
${geronimo_servlet.version}
-
-
-
-
-
org.apache.myfaces.core
myfaces-api
diff --git a/readme/README_M4.txt b/readme/README_M4.txt
index 478439f3d..6230b4e46 100644
--- a/readme/README_M4.txt
+++ b/readme/README_M4.txt
@@ -199,7 +199,7 @@ New Feature
* [OWB-137] - implement BusyConversationException use case
* [OWB-138] - implement NonexistentConversationException use case
* [OWB-226] - create a way to dynamically add Extensions to our tests
-* [OWB-229] - add support for the JSF2 javax.faces.bean.ViewScoped
annotation
+* [OWB-229] - add support for the JSF2 jakarta.faces.bean.ViewScoped
annotation
* [OWB-230] - Enable/Disable Configuration of JSF2 Extensions
* [OWB-277] - Owb on Google App Engine
diff --git
a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
index d58ce729f..b69d5a519 100644
---
a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
+++
b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
@@ -26,7 +26,7 @@ import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.Conversation;
import
[openwebbeans] 03/03: OWB-1417 another illegal test with unspecified invocation order
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 6a98ed1bf60fc4bd3432d83d87702dbab748c157 Author: Mark Struberg AuthorDate: Thu Jan 26 23:03:49 2023 +0100 OWB-1417 another illegal test with unspecified invocation order --- webbeans-tck/standalone-suite.xml | 5 + webbeans-tck/testng-dev.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 7704c7450..fcaa02f3c 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -84,6 +84,11 @@ + + + + +
[openwebbeans] 01/03: OWB-1417 implement ObserverMethod#getDeclaringBean
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 53ce5aa68ffa568a1df527a79845aeea2aea6fc1
Author: Mark Struberg
AuthorDate: Thu Jan 26 22:10:09 2023 +0100
OWB-1417 implement ObserverMethod#getDeclaringBean
---
.../src/main/java/org/apache/webbeans/event/OwbObserverMethod.java | 7 +++
webbeans-tck/testng-dev.xml| 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
b/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
index 7cf17d469..3b6016db0 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
@@ -20,6 +20,7 @@ package org.apache.webbeans.event;
import java.util.Set;
+import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.ObserverMethod;
@@ -36,4 +37,10 @@ public interface OwbObserverMethod extends
ObserverMethod
* Returns the {@link InjectionPoint}s for the parameters of this observer
method.
*/
Set getInjectionPoints();
+
+@Override
+default Bean getDeclaringBean()
+{
+return getOwnerBean();
+}
}
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 4b4aa1ef5..66ad653b4 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -19,7 +19,7 @@
-
+
[openwebbeans] 02/03: OWB-1417 disable more invalid TCK tests
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 4e3ef0419043dd6f58898e99abff556ba7f9dfb7
Author: Mark Struberg
AuthorDate: Thu Jan 26 22:57:57 2023 +0100
OWB-1417 disable more invalid TCK tests
---
.../java/org/apache/webbeans/config/BeansDeployer.java | 2 +-
webbeans-tck/standalone-suite.xml | 18 +-
webbeans-tck/testng-dev.xml| 2 +-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
index 32cbaf146..99e0e8371 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
@@ -2105,7 +2105,7 @@ public class BeansDeployer
Set> observerMethods;
AnnotatedType beanAnnotatedType = bean.getAnnotatedType();
-if(bean.isEnabled())
+if (bean.isEnabled())
{
observerMethods = new
ObserverMethodsBuilder<>(webBeansContext,
beanAnnotatedType).defineObserverMethods(bean, false);
}
diff --git a/webbeans-tck/standalone-suite.xml
b/webbeans-tck/standalone-suite.xml
index 5492700ac..7704c7450 100644
--- a/webbeans-tck/standalone-suite.xml
+++ b/webbeans-tck/standalone-suite.xml
@@ -65,6 +65,8 @@
@@ -77,6 +79,11 @@
+
+
+
+
+
@@ -124,6 +131,15 @@
+
+
+
+
+
+
+
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 66ad653b4..c448d2342 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -19,7 +19,7 @@
-
+
[openwebbeans] branch main updated (edcd0d3b3 -> 6a98ed1bf)
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 edcd0d3b3 OWB-1417 improve Alternative Sterotype handling new 53ce5aa68 OWB-1417 implement ObserverMethod#getDeclaringBean new 4e3ef0419 OWB-1417 disable more invalid TCK tests new 6a98ed1bf OWB-1417 another illegal test with unspecified invocation order 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: .../org/apache/webbeans/config/BeansDeployer.java | 2 +- .../apache/webbeans/event/OwbObserverMethod.java | 7 +++ webbeans-tck/standalone-suite.xml | 23 +- webbeans-tck/testng-dev.xml| 2 +- 4 files changed, 31 insertions(+), 3 deletions(-)
[openwebbeans] 02/02: OWB-1417 improve Alternative Sterotype handling
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 edcd0d3b353d37601c3b9d64741acaa3cc8b839d
Author: Mark Struberg
AuthorDate: Thu Jan 26 21:59:51 2023 +0100
OWB-1417 improve Alternative Sterotype handling
---
.../org/apache/webbeans/util/WebBeansUtil.java | 11 +++--
webbeans-tck/testng-dev.xml| 47 +++---
2 files changed, 32 insertions(+), 26 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
index 73781bd41..911b6848a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
@@ -902,14 +902,19 @@ public final class WebBeansUtil
}
if (stereotypes != null && !stereotypes.isEmpty())
{
+boolean hasPriority = at.getAnnotation(Priority.class) != null;
+boolean hasStereotypeWithPriority = false;
for (Class stereotype : stereotypes)
{
-if (alternativesManager.isAlternativeStereotype(stereotype) ||
-at.getAnnotation(Priority.class) != null ||
isStereotypeWithPriority(stereotype, stereotypes))
+if (isStereotypeWithPriority(stereotype, stereotypes))
{
-return true;
+hasStereotypeWithPriority = true;
}
}
+if (hasPriority || hasStereotypeWithPriority)
+{
+return true;
+}
}
return false;
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index c97b98bd7..4b4aa1ef5 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -16,29 +16,30 @@
License.
-->
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
[openwebbeans] branch main updated (43cbd4209 -> edcd0d3b3)
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 43cbd4209 OWB-1417 misleading test new dbe443be0 OWB-1417 disable more invalid tests new edcd0d3b3 OWB-1417 improve Alternative Sterotype handling 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: .../org/apache/webbeans/util/WebBeansUtil.java | 11 +++-- webbeans-tck/standalone-suite.xml | 18 + webbeans-tck/testng-dev.xml| 47 +++--- 3 files changed, 50 insertions(+), 26 deletions(-)
[openwebbeans] 01/02: OWB-1417 disable more invalid tests
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 dbe443be0ea0fd4bd0993e43e112ad47538e61ca Author: Mark Struberg AuthorDate: Thu Jan 26 20:52:17 2023 +0100 OWB-1417 disable more invalid tests --- webbeans-tck/standalone-suite.xml | 18 ++ webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 515d22b8f..5492700ac 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -106,6 +106,24 @@ + + + + + + + + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index e2e94ddf8..c97b98bd7 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -18,9 +18,9 @@ - + - +
[openwebbeans] 01/02: OWB-1417 disable test which isn't covered by the spec
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 17fb76f8e151b935fd563286c2183bf3eb510800 Author: Mark Struberg AuthorDate: Thu Jan 26 19:48:28 2023 +0100 OWB-1417 disable test which isn't covered by the spec --- webbeans-tck/standalone-suite.xml | 10 ++ webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 28b59f779..a52d7ce40 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -88,6 +88,16 @@ + + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 260787f45..7673c0da3 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -18,9 +18,9 @@ - + - +
[openwebbeans] branch main updated (1768aee36 -> 43cbd4209)
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 1768aee36 OWB-1417 createInjectionTarget IllegalArgumentException on failure new 17fb76f8e OWB-1417 disable test which isn't covered by the spec new 43cbd4209 OWB-1417 misleading test 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: webbeans-tck/standalone-suite.xml | 19 +++ webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-)
[openwebbeans] 02/02: OWB-1417 misleading test
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 43cbd42096678cf8f897fbb1c0c93a995c971dad Author: Mark Struberg AuthorDate: Thu Jan 26 20:30:08 2023 +0100 OWB-1417 misleading test --- webbeans-tck/standalone-suite.xml | 9 + webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index a52d7ce40..515d22b8f 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -97,6 +97,15 @@ + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 7673c0da3..e2e94ddf8 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -18,9 +18,9 @@ - + - +
[openwebbeans] branch main updated: OWB-1417 createInjectionTarget IllegalArgumentException on failure
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 1768aee36 OWB-1417 createInjectionTarget IllegalArgumentException on
failure
1768aee36 is described below
commit 1768aee366c767695c2b7a6a4b920eaab0e429b2
Author: Mark Struberg
AuthorDate: Thu Jan 26 19:37:54 2023 +0100
OWB-1417 createInjectionTarget IllegalArgumentException on failure
According to the spec createInjectionTarget should throw an IAE if a problem
exists with an InjectionPoint.
---
.../apache/webbeans/container/BeanManagerImpl.java | 2 +-
.../container/InjectionTargetFactoryImpl.java | 1 +
.../ValidatingInjectionTargetFactory.java | 57 ++
webbeans-tck/testng-dev.xml| 4 +-
4 files changed, 61 insertions(+), 3 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index e11e9518c..945df6c7b 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -871,7 +871,7 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
public InjectionTargetFactory
getInjectionTargetFactory(AnnotatedType type)
{
-return new InjectionTargetFactoryImpl<>(type, webBeansContext);
+return new ValidatingInjectionTargetFactory<>(type, webBeansContext);
}
public Bean createBean(BeanAttributes attributes, Class type,
InjectionTargetFactory factory)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
index 2763a3723..c8f46c007 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
@@ -64,6 +64,7 @@ public class InjectionTargetFactoryImpl implements
InjectionTargetFactory
AnnotatedType at = getAnnotatedType();
InjectionTargetImpl injectionTarget
= new InjectionTargetImpl<>(at, createInjectionPoints(bean),
webBeansContext, getPostConstructMethods(), getPreDestroyMethods());
+
if (ManagedBean.class.isInstance(bean))
{
ManagedBean.class.cast(bean).setOriginalInjectionTarget(injectionTarget);
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
new file mode 100644
index 0..f87b4c114
--- /dev/null
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.webbeans.container;
+
+import java.util.Set;
+
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import org.apache.webbeans.config.WebBeansContext;
+
+/**
+ * InjectionTargetFactory which validates the craeted InjectionTarget.
+ * This is only required if the InjectionTarget gets created manually
+ * via the BeanManager.
+ */
+public class ValidatingInjectionTargetFactory extends
InjectionTargetFactoryImpl
+{
+public ValidatingInjectionTargetFactory(AnnotatedType annotatedType,
WebBeansContext webBeansContext)
+{
+super(annotatedType, webBeansContext);
+}
+
+@Override
+public InjectionTarget createInjectionTarget(Bean bean)
+{
+final InjectionTarget injectionTarget =
super.createInjectionTarget(bean);
+final Set injectionPoints =
injectionTarget.getInjectionPoints();
+try
+
[openwebbeans] branch main updated: OWB-1417 implement setPriority
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 419580607 OWB-1417 implement setPriority
419580607 is described below
commit 419580607cb25f512de93919d573585229c648f6
Author: Mark Struberg
AuthorDate: Thu Jan 26 18:18:36 2023 +0100
OWB-1417 implement setPriority
---
.../webbeans/configurator/BeanConfiguratorImpl.java | 15 +++
webbeans-tck/testng-dev.xml | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
index 247170bbf..46c74a5e1 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
@@ -28,6 +28,7 @@ import jakarta.enterprise.inject.spi.BeanAttributes;
import jakarta.enterprise.inject.spi.CDI;
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.Prioritized;
import jakarta.enterprise.inject.spi.Producer;
import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
import jakarta.enterprise.util.TypeLiteral;
@@ -338,6 +339,11 @@ public class BeanConfiguratorImpl implements
BeanConfigurator
{
updateQualifiers();
setPassivationIdIfNeeded();
+if (priority != null && alternative)
+{
+return new ConstructedPrioritizedBean();
+}
+
return new ConstructedBean();
}
@@ -659,4 +665,13 @@ public class BeanConfiguratorImpl implements
BeanConfigurator
}
}
+
+public class ConstructedPrioritizedBean extends ConstructedBean implements
Prioritized
+{
+@Override
+public int getPriority()
+{
+return priority;
+}
+}
}
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 8e4dc015b..1be83ce4e 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -18,7 +18,7 @@
-
+
[openwebbeans] branch main updated: OWB-1417 fire the Startup event
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 1d4fc0ef1 OWB-1417 fire the Startup event
1d4fc0ef1 is described below
commit 1d4fc0ef1cccdd9a4aaf033abc71a6fd79ddd552
Author: Mark Struberg
AuthorDate: Thu Jan 26 18:05:03 2023 +0100
OWB-1417 fire the Startup event
---
.../src/main/java/org/apache/webbeans/container/BeanManagerImpl.java | 1 -
.../main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java | 4
webbeans-tck/testng-dev.xml | 2 +-
.../java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java | 4
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 92cb21c29..e11e9518c 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -447,7 +447,6 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
* @deprecated This method got deprecated in CDI-2.0.
* Users should use {@link #getEvent()} instead.
*/
-@Deprecated
public void fireEvent(Object event, Annotation... bindings)
{
fireEvent(event, false, bindings);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
index 60b1fddea..183c34282 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
@@ -22,6 +22,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ConversationScoped;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Startup;
import jakarta.inject.Singleton;
import java.util.Properties;
import java.util.logging.Logger;
@@ -71,6 +72,9 @@ public class StandaloneLifeCycle extends AbstractLifeCycle
webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
new Object(),
InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
}
+
+// fire Startup event
+webBeansContext.getBeanManagerImpl().fireEvent(new Startup());
}
@Override
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 7d0df47e7..8e4dc015b 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -18,7 +18,7 @@
-
+
diff --git
a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
index 45fd63521..d7e79b578 100644
---
a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
+++
b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
@@ -18,6 +18,7 @@
*/
package org.apache.webbeans.web.lifecycle;
+import jakarta.enterprise.event.Startup;
import org.apache.webbeans.annotation.InitializedLiteral;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
@@ -144,6 +145,9 @@ public class WebContainerLifecycle extends AbstractLifeCycle
webBeansContext.getBeanManagerImpl().fireEvent(
servletContext != null ? servletContext : new Object(),
InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
+// fire Startup event
+webBeansContext.getBeanManagerImpl().fireEvent(new Startup());
+
// shut down the RequestContext again
webBeansContext.getContextsService().endContext(RequestScoped.class, null);
}
[openwebbeans] branch main updated: OWB-1417 More than 1 Sterotype with Priority not ok
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 5f994ec3f OWB-1417 More than 1 Sterotype with Priority not ok
5f994ec3f is described below
commit 5f994ec3fe9b1c8e3d71e846f96f8fcf44cbc673
Author: Mark Struberg
AuthorDate: Thu Jan 26 16:06:35 2023 +0100
OWB-1417 More than 1 Sterotype with Priority not ok
---
.../component/creation/ManagedBeanBuilder.java | 21 +
webbeans-tck/standalone-suite.xml | 11 +++
webbeans-tck/testng-dev.xml | 4 ++--
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
index 68ed56916..827fccbb7 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
@@ -18,6 +18,10 @@
*/
package org.apache.webbeans.component.creation;
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import jakarta.annotation.Priority;
import jakarta.enterprise.inject.UnproxyableResolutionException;
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.BeanAttributes;
@@ -25,6 +29,7 @@ import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.WebBeansUtil;
@@ -64,6 +69,7 @@ public class ManagedBeanBuilder>
{
M bean = (M) new ManagedBean<>(webBeansContext, WebBeansType.MANAGED,
annotatedType, beanAttributes, annotatedType.getJavaClass());
bean.setEnabled(webBeansContext.getWebBeansUtil().isBeanEnabled(beanAttributes,
annotatedType, bean.getStereotypes()));
+checkStereotypes(bean.getStereotypes());
webBeansContext.getWebBeansUtil().checkManagedBeanCondition(annotatedType);
WebBeansUtil.checkGenericType(annotatedType.getJavaClass(),
beanAttributes.getScope());
webBeansContext.getWebBeansUtil().validateBeanInjection(bean);
@@ -75,4 +81,19 @@ public class ManagedBeanBuilder>
}
return (M) new UnproxyableBean<>(webBeansContext,
WebBeansType.MANAGED, beanAttributes, annotatedType,
annotatedType.getJavaClass(), lazyException);
}
+
+private void checkStereotypes(Set> stereotypes)
+{
+if (stereotypes != null && stereotypes.size() > 1)
+{
+long stereoTypesWithPriority = stereotypes.stream()
+.filter(s -> s.getAnnotation(Priority.class) != null)
+.count();
+if (stereoTypesWithPriority > 1)
+{
+throw new WebBeansConfigurationException("More than one
Stereotype with @Priority on a bean is not allowed!");
+}
+}
+
+}
}
diff --git a/webbeans-tck/standalone-suite.xml
b/webbeans-tck/standalone-suite.xml
index 27a876734..28b59f779 100644
--- a/webbeans-tck/standalone-suite.xml
+++ b/webbeans-tck/standalone-suite.xml
@@ -78,6 +78,17 @@
+
+
+
+
+
+
+
+
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 2ce4ad018..7d0df47e7 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -18,9 +18,9 @@
-
+
-
+
[openwebbeans] branch main updated: OWB-1417 disable broken TCK tests
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 b1e45eb67 OWB-1417 disable broken TCK tests b1e45eb67 is described below commit b1e45eb67d61fbcbc51aa4f9674f3b889bfdc5a5 Author: Mark Struberg AuthorDate: Thu Jan 26 15:05:18 2023 +0100 OWB-1417 disable broken TCK tests Those tests assume a specific order of interceptors with the same @Priority. But this is nowhere defined, not by the Interceptors spec, nor by CDI. --- webbeans-tck/standalone-suite.xml | 18 ++ webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 98ac8e10d..27a876734 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -60,6 +60,24 @@ + + + + + + + + + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index faf844c3e..2ce4ad018 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -18,9 +18,9 @@ - + - +
[openwebbeans] branch main updated: OWB-1418 refine Priority on nested Stereotypes
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 53d3837cb OWB-1418 refine Priority on nested Stereotypes
53d3837cb is described below
commit 53d3837cb07f9d4fec5e41696882e2e5fd5561e2
Author: Mark Struberg
AuthorDate: Wed Jan 25 20:37:04 2023 +0100
OWB-1418 refine Priority on nested Stereotypes
---
.../java/org/apache/webbeans/util/WebBeansUtil.java| 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
index 3e279805d..a855a4521 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
@@ -905,7 +905,7 @@ public final class WebBeansUtil
for (Class stereotype : stereotypes)
{
if (alternativesManager.isAlternativeStereotype(stereotype) &&
-(at.getAnnotation(Priority.class) != null ||
stereotype.getAnnotation(Priority.class) != null))
+(at.getAnnotation(Priority.class) != null ||
isStereotypeWithPriority(stereotype, stereotypes)))
{
return true;
}
@@ -916,6 +916,22 @@ public final class WebBeansUtil
}
+private boolean isStereotypeWithPriority(Class
stereotype, Set> stereotypes)
+{
+if (stereotype.getAnnotation(Priority.class) != null)
+{
+return true;
+}
+for (Annotation annotation : stereotype.getAnnotations())
+{
+if (stereotypes.contains(annotation.annotationType()) &&
annotation.annotationType().getAnnotation(Priority.class) != null)
+{
+return true;
+}
+}
+return false;
+}
+
public static boolean isAlternative(Annotated annotated, Set> stereotypes)
{
Asserts.assertNotNull(annotated, "annotated");
[openwebbeans] branch main updated: OWB-1418 @Priority on Alternative Sterotypes enables bean
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 4c42bea00 OWB-1418 @Priority on Alternative Sterotypes enables bean
4c42bea00 is described below
commit 4c42bea0041b70f788d9e5e4d900199d939e9de4
Author: Mark Struberg
AuthorDate: Wed Jan 25 19:43:59 2023 +0100
OWB-1418 @Priority on Alternative Sterotypes enables bean
---
.../org/apache/webbeans/util/WebBeansUtil.java | 5 +--
.../unittests/xml/strict/AlternativesTest.java | 12
.../webbeans/test/xml/strict/Alternative4.java | 26
.../strict/AlternativeStereotypeWithPriority.java | 36 ++
webbeans-tck/standalone-suite.xml | 15 +++--
webbeans-tck/testng-dev.xml| 2 +-
6 files changed, 82 insertions(+), 14 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
index 0aa876d57..3e279805d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
@@ -900,11 +900,12 @@ public final class WebBeansUtil
{
return true;
}
-if (stereotypes != null && !stereotypes.isEmpty() &&
at.getAnnotation(Priority.class) != null)
+if (stereotypes != null && !stereotypes.isEmpty())
{
for (Class stereotype : stereotypes)
{
-if (alternativesManager.isAlternativeStereotype(stereotype))
+if (alternativesManager.isAlternativeStereotype(stereotype) &&
+(at.getAnnotation(Priority.class) != null ||
stereotype.getAnnotation(Priority.class) != null))
{
return true;
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
index 3c3364da7..b2c6f9351 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
@@ -22,7 +22,9 @@ package org.apache.webbeans.test.unittests.xml.strict;
import jakarta.enterprise.inject.spi.Bean;
import org.apache.webbeans.test.xml.strict.Alternative3;
+import org.apache.webbeans.test.xml.strict.Alternative4;
import org.apache.webbeans.test.xml.strict.AlternativeStereotype;
+import org.apache.webbeans.test.xml.strict.AlternativeStereotypeWithPriority;
import org.apache.webbeans.test.xml.strict.OriginalBean;
import org.apache.webbeans.test.xml.strict.SomeInterface;
import org.junit.Assert;
@@ -65,6 +67,16 @@ public class AlternativesTest extends AbstractUnitTest
Assert.assertTrue(instance instanceof Alternative3);
}
+@Test
+public void testPriorityOnSterotypeEnabledAlternative()
+{
+startContainer(Alternative4.class,
AlternativeStereotypeWithPriority.class, OriginalBean.class);
+
+SomeInterface instance = getInstance(SomeInterface.class);
+Assert.assertNotNull(instance);
+Assert.assertTrue(instance instanceof Alternative4);
+}
+
@Test(expected=WebBeansConfigurationException.class)
public void testDoubleAlternativeClass()
{
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/Alternative4.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/Alternative4.java
new file mode 100644
index 0..faec6806f
--- /dev/null
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/Alternative4.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.webbeans.test.xml.strict;
+
+
+@AlternativeStereotypeWithPriority
+public class Alternative4 implements SomeIn
[openwebbeans] 01/02: OWB-1417 implement Handle
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 55f97ee2beb38dee7492bdfa47cc1ca6f65d4c46
Author: Mark Struberg
AuthorDate: Wed Jan 25 18:25:25 2023 +0100
OWB-1417 implement Handle
---
.../webbeans/inject/instance/InstanceImpl.java | 69 --
1 file changed, 63 insertions(+), 6 deletions(-)
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 059c94497..73a7075f6 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
@@ -32,6 +32,7 @@ import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import jakarta.enterprise.context.spi.AlterableContext;
@@ -112,15 +113,15 @@ public class InstanceImpl implements Instance,
Serializable
@Override
public Handle getHandle()
{
-//X TODO implement!
-return null;
+return new HandleImpl(getBean());
}
@Override
public Iterable> handles()
{
-//X TODO implement!
-return null;
+return resolveBeans().stream()
+.map(bean -> (Handle)new HandleImpl(bean))
+.collect(Collectors.toList());
}
/**
@@ -132,6 +133,13 @@ public class InstanceImpl implements Instance,
Serializable
public T get()
{
+Bean bean = getBean();
+
+return create(bean);
+}
+
+private Bean getBean()
+{
Set> beans = resolveBeans();
Bean bean = webBeansContext.getBeanManagerImpl().resolve(beans);
@@ -142,8 +150,7 @@ public class InstanceImpl implements Instance,
Serializable
anns = qualifierAnnotations.toArray(anns);
InjectionExceptionUtil.throwUnsatisfiedResolutionException(ClassUtil.getClazz(injectionClazz),
injectionPoint, anns);
}
-
-return create(bean);
+return bean;
}
@@ -456,4 +463,54 @@ public class InstanceImpl implements Instance,
Serializable
out.writeObject(delegate);
}
}
+
+public class HandleImpl implements Instance.Handle
+{
+private final Bean bean;
+private boolean destroyed = false;
+private X contextualReference = null;
+
+public HandleImpl(Bean bean)
+{
+this.bean = (Bean) bean;
+}
+
+@Override
+public X get()
+{
+if (destroyed)
+{
+throw new IllegalStateException("Contextual Reference already
destroyed");
+}
+if (contextualReference == null)
+{
+contextualReference = (X) create(bean);
+}
+
+return contextualReference;
+}
+
+@Override
+public Bean getBean()
+{
+return bean;
+}
+
+@Override
+public void destroy()
+{
+if (!destroyed && contextualReference != null)
+{
+InstanceImpl.this.destroy((T) contextualReference);
+destroyed = true;
+}
+}
+
+@Override
+public void close()
+{
+destroy();
+}
+}
+
}
[openwebbeans] branch main updated (b9f2db66d -> 7ef08042b)
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 b9f2db66d OWB-1417 fixing Arquillian handling of BDA new 55f97ee2b OWB-1417 implement Handle new 7ef08042b OWB-1417 disable tests with BuildCompatibleExtension 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: .../webbeans/inject/instance/InstanceImpl.java | 69 -- webbeans-tck/standalone-suite.xml | 13 +++- webbeans-tck/testng-dev.xml| 4 +- 3 files changed, 77 insertions(+), 9 deletions(-)
[openwebbeans] 02/02: OWB-1417 disable tests with BuildCompatibleExtension
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 7ef08042bca23435fc504b15d709dfb9da71e26e Author: Mark Struberg AuthorDate: Wed Jan 25 18:25:46 2023 +0100 OWB-1417 disable tests with BuildCompatibleExtension --- webbeans-tck/standalone-suite.xml | 13 - webbeans-tck/testng-dev.xml | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 58253720b..ecb30c2b0 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -47,6 +47,7 @@ + @@ -55,7 +56,17 @@ - + + + + + + + + + + + diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml index 67ebf00dd..60a2bde40 100644 --- a/webbeans-tck/testng-dev.xml +++ b/webbeans-tck/testng-dev.xml @@ -18,9 +18,9 @@ - + - +
[openwebbeans] branch main updated: OWB-1417 fixing Arquillian handling of BDA
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 b9f2db66d OWB-1417 fixing Arquillian handling of BDA
b9f2db66d is described below
commit b9f2db66da88bf4edcd4a117f31c3b14449d0861
Author: Mark Struberg
AuthorDate: Wed Jan 25 16:32:51 2023 +0100
OWB-1417 fixing Arquillian handling of BDA
Bean Defining Annotation logic was incomplete in our Arquillian Adapter.
---
.../webbeans/arquillian/standalone/OwbArquillianScannerService.java| 3 +++
1 file changed, 3 insertions(+)
diff --git
a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
index 87cea4f09..9a00b3b73 100644
---
a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
+++
b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
@@ -20,6 +20,8 @@ package org.apache.webbeans.arquillian.standalone;
import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.decorator.Decorator;
+import jakarta.interceptor.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.BDABeansXmlScanner;
import org.apache.webbeans.spi.BdaScannerService;
@@ -297,6 +299,7 @@ public class OwbArquillianScannerService implements
BdaScannerService
{
Class annotationType =
annotation.annotationType();
boolean isBeanAnnotation = beanManager.isScope(annotationType);
+isBeanAnnotation |= annotationType.equals(Decorator.class) ||
annotationType.equals(Interceptor.class);
isBeanAnnotation = isBeanAnnotation ||
beanManager.isStereotype(annotationType);
return isBeanAnnotation;
[openwebbeans] 02/02: OWB1417 explicit test for @Priority on Interceptor
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 c204f452c01889ae14ce4badd29724548ffc2cfd
Author: Mark Struberg
AuthorDate: Wed Jan 25 15:43:29 2023 +0100
OWB1417 explicit test for @Priority on Interceptor
---
bom/openwebbeans-se-bom/pom.xml| 161 ++---
webbeans-impl/src/it/properties/pom.xml| 11 --
.../webbeans/config/OpenWebBeansConfiguration.java | 4 +-
.../interceptors/priority/InterceptedBean.java | 31
.../priority/NotPriorityActivatedInterceptor.java | 39 +
.../priority/PriorityActivatedInterceptor.java | 41 ++
.../PriorityActivatedInterceptorBinding.java | 36 +
.../priority/PriorityActivatedInterceptorTest.java | 57
webbeans-tck/pom.xml | 5 +
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
webbeans-tck/testng-dev.xml| 7 +-
webbeans-tomcat/pom.xml| 9 +-
webbeans-tomcat/src/it/servletinjection/pom.xml| 22 +--
13 files changed, 313 insertions(+), 112 deletions(-)
diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml
index edc25b6b2..2a453ead5 100644
--- a/bom/openwebbeans-se-bom/pom.xml
+++ b/bom/openwebbeans-se-bom/pom.xml
@@ -16,91 +16,84 @@
License.
-->
http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-bom
-org.apache.openwebbeans.bom
-4.0.0-SNAPSHOT
-
- 4.0.0
+
+bom
+org.apache.openwebbeans.bom
+4.0.0-SNAPSHOT
+
+4.0.0
- openwebbeans-se-bom
- SE BOM
- Apache OpenWebBeans SE BOM
- pom
+openwebbeans-se-bom
+SE BOM
+Apache OpenWebBeans SE BOM
+pom
-
-
- org.apache.geronimo.specs
- geronimo-annotation_1.3_spec
- ${geronimo_annotation.version}
- jakarta
-
-
- org.apache.geronimo.specs
- geronimo-jcdi_2.0_spec
- ${geronimo_cdi.version}
- jakarta
-
-
- org.apache.geronimo.specs
- geronimo-atinject_1.0_spec
- ${geronimo_atinject.version}
- jakarta
-
-
- org.apache.geronimo.specs
- geronimo-interceptor_1.2_spec
- ${geronimo_interceptor.version}
- jakarta
-
+
+
+jakarta.annotation
+jakarta.annotation-api
+
+
+jakarta.inject
+jakarta.inject-api
+
+
+jakarta.enterprise
+jakarta.enterprise.cdi-api
+
+
+jakarta.interceptor
+jakarta.interceptor-api
+test
+
-
- org.apache.openwebbeans
- openwebbeans-spi
- ${project.version}
- jakarta
-
-
- org.apache.openwebbeans
- *
-
-
- org.apache.geronimo.specs
- *
-
-
-
-
- org.apache.openwebbeans
- openwebbeans-impl
- ${project.version}
- jakarta
-
-
- org.apache.openwebbeans
- *
-
-
- org.apache.geronimo.specs
- *
-
-
-
-
- org.apache.openwebbeans
- openwebbeans-se
- ${project.version}
- jakarta
-
-
- org.apache.openwebbeans
- *
-
-
- org.apache.geronimo.specs
- *
-
-
-
-
+
+org.apache.openwebbeans
+openwebbeans-spi
+${project.version}
+jakarta
+
+
+org.apache.openwebbeans
+*
+
+
+org.apache.geronimo.specs
+*
+
+
+
+
+org.apache.openwebbeans
+openwebbeans-impl
+${project.version}
+jakarta
+
+
+org.apache.openwebbeans
+*
+
+
+org.apache.geronimo.specs
+*
+
+
+
+
+org.apache.openwebbeans
+openwebbeans-se
+${project.version}
+jakarta
+
+
+org.apache.openwebbeans
+*
+
+
+org.apache.geronimo.specs
+*
+
+
+
+
\ No newline at end of file
diff --git a/webbeans-impl/src/it/properties/pom.xml
b/webbeans-impl/src/it/properties/pom.xml
index cb43576b6..29408dcf9 100644
---
[openwebbeans] branch main updated (bc9f839dd -> c204f452c)
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 bc9f839dd OWB-1417 enable tck again
new f6a57fed9 OWB-1417 adopt TCK setup for package moves
new c204f452c OWB1417 explicit test for @Priority on Interceptor
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:
bom/openwebbeans-se-bom/pom.xml| 161 ++---
webbeans-impl/src/it/properties/pom.xml| 11 --
.../webbeans/config/OpenWebBeansConfiguration.java | 4 +-
.../interceptors/priority/InterceptedBean.java | 11 +-
.../priority/NotPriorityActivatedInterceptor.java} | 16 +-
.../PriorityActivatedInterceptor.java} | 23 +--
.../PriorityActivatedInterceptorBinding.java | 8 +-
.../priority/PriorityActivatedInterceptorTest.java | 57
webbeans-tck/pom.xml | 5 +
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
webbeans-tck/standalone-suite.xml | 60
webbeans-tck/testng-dev.xml| 7 +-
webbeans-tomcat/pom.xml| 9 +-
webbeans-tomcat/src/it/servletinjection/pom.xml| 22 +--
14 files changed, 229 insertions(+), 167 deletions(-)
copy
webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java
=>
webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/priority/InterceptedBean.java
(82%)
copy
webbeans-impl/src/test/java/org/apache/webbeans/test/{component/exception/AroundInvokeWithStaticMethodComponent.java
=> interceptors/priority/NotPriorityActivatedInterceptor.java} (75%)
copy
webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/{common/SecureInterceptor.java
=> priority/PriorityActivatedInterceptor.java} (74%)
copy
samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
=>
webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/priority/PriorityActivatedInterceptorBinding.java
(90%)
create mode 100644
webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/priority/PriorityActivatedInterceptorTest.java
[openwebbeans] 01/02: OWB-1417 adopt TCK setup for package moves
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 f6a57fed9469d70fcfb245dd02d68d899f3e3e3c Author: Mark Struberg AuthorDate: Wed Jan 25 08:58:13 2023 +0100 OWB-1417 adopt TCK setup for package moves --- webbeans-tck/standalone-suite.xml | 60 +++ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/webbeans-tck/standalone-suite.xml b/webbeans-tck/standalone-suite.xml index 6b98b038e..58253720b 100644 --- a/webbeans-tck/standalone-suite.xml +++ b/webbeans-tck/standalone-suite.xml @@ -57,29 +57,30 @@ - + -! https://issues.jboss.org/browse/CDITCK-577 + -! https://issues.jboss.org/browse/CDITCK-432 - + + -! https://issues.jboss.org/browse/CDITCK-578, https://issues.jboss.org/browse/CDITCK-579 - + + @@ -87,24 +88,24 @@ -! this tests Weld specific internals + -! https://issues.jboss.org/browse/CDITCK-580 - + + -! https://issues.jboss.org/browse/CDI-498 dots in EL names are not allowed by the EL spec. - + + -! OWB provides a bit more for @New than CDI requires + @@ -112,47 +113,46 @@ -! https://issues.jboss.org/browse/CDITCK-582 - + + -! https://issues.jboss.org/browse/CDITCK-586 + -! https://issues.jboss.org/browse/CDITCK-588 equals on AnnotatedType -! https://issues.jboss.org/browse/CDITCK-589 because the ct predicate ends up randomly removing from the wrong ct - + + + -! https://issues.jboss.org/browse/CDITCK-573 should be solved with tck 2.0.1.Final - + + -! https://issues.jboss.org/browse/CDITCK-591 - + + -! https://issues.jboss.org/browse/CDI-581 , both tests... - + + - + -! CDITCK-466 - + + --->
[openwebbeans] branch main updated: OWB-1417 enable tck again
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 bc9f839dd OWB-1417 enable tck again
bc9f839dd is described below
commit bc9f839dd315d7f2ebced95483f76ca013cd48b0
Author: Mark Struberg
AuthorDate: Tue Jan 24 21:09:50 2023 +0100
OWB-1417 enable tck again
Quite a few are failing as some packages got moved around
---
pom.xml | 4 +-
webbeans-tck/pom.xml | 160 ++
webbeans-tck/standalone-suite.xml | 36 +
3 files changed, 115 insertions(+), 85 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8a2f50f26..41e3f458a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -769,14 +769,12 @@
webbeans-ee-common
webbeans-ee
webbeans-jms
+webbeans-tck
-
+
jakarta.interceptor
jakarta.interceptor-api
-
org.apache.xbean
xbean-finder-shaded
@@ -60,7 +61,7 @@
org.testng
testng
-6.14.3
+7.4.0
test
@@ -74,30 +75,48 @@
org.apache.openwebbeans
openwebbeans-spi
-
-
-jakarta.enterprise
-jakarta.enterprise.cdi-api
-
-
+
+
+jakarta.enterprise
+jakarta.enterprise.cdi-api
+
+
+
+org.apache.tomcat
+tomcat-servlet-api
+
+
+org.apache.tomcat
+tomcat-jsp-api
+
+
+
+org.apache.openwebbeans
+openwebbeans-porting
+
+
+
+org.apache.openwebbeans.arquillian
+owb-arquillian-standalone
+${project.version}
+
+
+
-org.apache.geronimo.specs
-geronimo-ejb_3.1_spec
+
+org.jboss.arquillian.container
+arquillian-container-test-impl-base
+${arquillian.version}
-org.jboss.cdi.tck
-cdi-tck-impl
+jakarta.enterprise
+cdi-tck-core-impl
${cdi.tck.version}
-compile
-javax.enterprise
-cdi-api
-
-
-javax.faces
-jsf-api
+jakarta.enterprise
+jakarta.enterprise.cdi-api
jakarta.servlet
@@ -105,12 +124,58 @@
jakarta.servlet.jsp
-jsp-api
+jakarta.servlet.jsp-api
+
+
+jakarta.interceptor
+jakarta.interceptor-api
-jakarta.transaction
-jta
+jakarta.annotation
+jakarta.annotation-api
+
+jakarta.el
+jakarta.el-api
+
+
+jakarta.inject
+jakarta.inject-api
+
+
+jakarta.ejb
+jakarta.ejb-api
+
+
@@ -124,42 +189,7 @@
-
-org.apache.openwebbeans
-openwebbeans-porting
-
-
-
-org.apache.openwebbeans.arquillian
-owb-arquillian-standalone
-${project.version}
-
-
-
-
-org.jboss.arquillian.container
-
arquillian-container-test-impl-base
-${arquillian.version}
-
-
-
-org.apache.geronimo.specs
-geronimo-jsp_2.2_spec
-1.1
-test
-
-
-org.apache.geronimo.specs
-geronimo-jta_1.1_spec
-test
-
-
-org.apache.geronimo.specs
-geronimo-servlet_3.0_spec
-test
-
-
org.apache.myfaces.core
myfaces-api
diff --git a/webbeans-tck/standalone-suite.xml
b/webbeans-tck/standalone-suite.xml
index d2582f928
[openwebbeans] branch main updated: update our doap file
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 996929233 update our doap file 996929233 is described below commit 996929233e32140b38f576d09774337d4e3481d1 Author: Mark Struberg AuthorDate: Tue Jan 24 20:44:28 2023 +0100 update our doap file --- doap_OpenWebBeans.rdf | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doap_OpenWebBeans.rdf b/doap_OpenWebBeans.rdf index 45dfe185f..5ec9965d3 100644 --- a/doap_OpenWebBeans.rdf +++ b/doap_OpenWebBeans.rdf @@ -28,7 +28,10 @@ https://openwebbeans.apache.org; /> https://openwebbeans.apache.org; /> Dependency Injection Platform. -OpenWebBeans is an ALv2-licensed implementation of the "Contexts and Dependency Injection for the Java EE platform" specification which is defined as JSR-299. + +OpenWebBeans is an ALv2-licensed implementation of the "Contexts and Dependency Injection for the Java EE platform" +specification which is defined as JSR-299, JSR-365, etc as well as the Jakarta CDI specification + http://issues.apache.org/jira/browse/OWB; /> https://openwebbeans.apache.org/community.html; /> https://www.apache.org/dyn/closer.cgi/openwebbeans/; /> @@ -36,9 +39,9 @@ http://projects.apache.org/category/javaee; /> -2.0.11 -2019-05-19 -2.0.11 +2.0.27 +2022-05-24 +2.0.27 @@ -53,8 +56,8 @@ Contexts and Dependency Injection for the Java EE platform - JCP - JSR 299, 346, 365 + JCP, Eclipse Jakarta + JSR 299, 346, 365, Jakarta CDI-4.0 http://jcp.org/en/jsr/detail?id=365"/>
[openwebbeans] branch main updated: OSB-1417 re-enable 3 more owb modules
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 e7af802e1 OSB-1417 re-enable 3 more owb modules e7af802e1 is described below commit e7af802e1d814c340737af0de3a456f9ce27a4df Author: Mark Struberg AuthorDate: Tue Jan 24 20:40:20 2023 +0100 OSB-1417 re-enable 3 more owb modules --- .../META-INF/openwebbeans/openwebbeans.properties | 2 +- pom.xml| 5 +-- readme/README.txt | 4 +-- readme/README_1_0_0-alpha-1.txt| 2 +- readme/README_1_0_0-alpha-2.txt| 2 +- readme/README_1_0_0.txt| 2 +- readme/README_1_1_0.txt| 2 +- readme/README_1_1_1.txt| 2 +- readme/README_1_1_2.txt| 2 +- readme/README_1_1_3.txt| 2 +- readme/README_1_1_4.txt| 4 +-- readme/README_1_1_5.txt| 4 +-- readme/README_1_1_6.txt| 4 +-- readme/README_1_2_0.txt| 4 +-- webbeans-ee-common/pom.xml | 27 webbeans-ee/pom.xml| 33 +--- .../webbeans/ee/beans/UserTransactionBean.java | 3 +- .../webbeans/ee/beans/UserTransactionProvider.java | 2 +- .../apache/webbeans/ee/beans/ValidatorBean.java| 2 +- .../webbeans/ee/beans/ValidatorFactoryBean.java| 2 +- .../ee/beans/ValidatorFactoryProvider.java | 2 +- .../webbeans/ee/beans/ValidatorProvider.java | 2 +- .../ee/event/TransactionalEventNotifier.java | 10 +++--- webbeans-jms/pom.xml | 36 +- .../org/apache/webbeans/jms/component/JmsBean.java | 2 +- .../jms/component/JmsComponentFactory.java | 20 ++-- .../apache/webbeans/jms/util/JmsProxyHandler.java | 22 ++--- .../java/org/apache/webbeans/jms/util/JmsUtil.java | 34 ++-- webbeans-porting/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- 30 files changed, 114 insertions(+), 128 deletions(-) diff --git a/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties b/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties index 2c35ac11d..0bc600c29 100644 --- a/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties @@ -32,7 +32,7 @@ # use the static HashMap instead of storing objects in JNDI as default org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService -# lookup the javax.transaction.TransactionManager via JNDI as default +# lookup the jakarta.transaction.TransactionManager via JNDI as default org.apache.webbeans.spi.TransactionService=org.apache.webbeans.corespi.se.DefaultTransactionService #use the web metadata as default diff --git a/pom.xml b/pom.xml index a3f206177..8a2f50f26 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,7 @@ 2.0.0 3.0.0 4.0.0 +3.0.0 10.1.5 @@ -765,11 +766,11 @@ webbeans-junit5 webbeans-porting atinject-tck -
[openwebbeans] branch owb_2.0.x created (now 0376bd705)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch owb_2.0.x in repository https://gitbox.apache.org/repos/asf/openwebbeans.git at 0376bd705 upgrade to apache-parent 29 No new revisions were added by this update.
[openwebbeans] branch main updated (4f4688575 -> 78050fea7)
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 4f4688575 OWB-1417 enable owb-ejb and owb-porting new f5c0a72c3 OWB-1417 remove our ancient owb-1.0 site docs new f7411b833 OWB-1417 fix atinject TCK new 78050fea7 OWB-1417 remove webbeans-resources module 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: atinject-tck/pom.xml | 23 +-- .../tck/specific/AtinjectTckSetupExtension.java| 23 +-- .../atinject/tck/specific/SpecificProducer.java| 11 +- .../webbeans/atinject/tck/specific/TckNew.java | 19 +-- .../jakarta.enterprise.inject.spi.Extension| 3 +- pom.xml| 1 + src/site/apt/contributing.apt | 84 -- src/site/apt/documentation.apt | 28 src/site/apt/examples/guess.apt| 14 -- src/site/apt/extensions/index.apt | 26 --- src/site/apt/index.apt | 82 -- src/site/apt/irc.apt | 28 src/site/apt/jakarta.apt | 110 - src/site/apt/jsr299.apt| 29 src/site/apt/jsr330.apt| 25 --- src/site/apt/trademarks.apt| 30 src/site/fml/faq.fml | 66 src/site/resources/documents/userguide.pdf | Bin 91264 -> 0 bytes .../resources/images/logos/openwebbeans_hor.png| Bin 9749 -> 0 bytes .../resources/images/logos/openwebbeans_small.png | Bin 6888 -> 0 bytes .../resources/images/logos/openwebbeans_vert.png | Bin 7763 -> 0 bytes src/site/site.xml | 62 --- webbeans-resource/pom.xml | 78 - .../spi/se/StandaloneResourceInjectionService.java | 173 .../spi/se/StandaloneResourceProcessor.java| 179 - .../META-INF/openwebbeans/openwebbeans.properties | 30 webbeans-resource/src/site/site.xml| 47 -- 27 files changed, 40 insertions(+), 1131 deletions(-) copy webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/disabledspecialization/VetoMeExtension.java => atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/AtinjectTckSetupExtension.java (56%) copy webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericQualifier.java => atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/TckNew.java (86%) copy webbeans-web/src/it/webcdiapp/src/main/resources/META-INF/openwebbeans/openwebbeans.properties => atinject-tck/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension (92%) delete mode 100644 src/site/apt/contributing.apt delete mode 100644 src/site/apt/documentation.apt delete mode 100644 src/site/apt/examples/guess.apt delete mode 100644 src/site/apt/extensions/index.apt delete mode 100644 src/site/apt/index.apt delete mode 100644 src/site/apt/irc.apt delete mode 100644 src/site/apt/jakarta.apt delete mode 100644 src/site/apt/jsr299.apt delete mode 100644 src/site/apt/jsr330.apt delete mode 100644 src/site/apt/trademarks.apt delete mode 100644 src/site/fml/faq.fml delete mode 100644 src/site/resources/documents/userguide.pdf delete mode 100644 src/site/resources/images/logos/openwebbeans_hor.png delete mode 100644 src/site/resources/images/logos/openwebbeans_small.png delete mode 100644 src/site/resources/images/logos/openwebbeans_vert.png delete mode 100644 src/site/site.xml delete mode 100644 webbeans-resource/pom.xml delete mode 100644 webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java delete mode 100644 webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java delete mode 100644 webbeans-resource/src/main/resources/META-INF/openwebbeans/openwebbeans.properties delete mode 100644 webbeans-resource/src/site/site.xml
[openwebbeans] 01/03: OWB-1417 remove our ancient owb-1.0 site docs
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 f5c0a72c35c6b4a477bb55c8f5ec752029d2ab24
Author: Mark Struberg
AuthorDate: Tue Jan 24 17:27:52 2023 +0100
OWB-1417 remove our ancient owb-1.0 site docs
Our site is now maintained via git and buildbot
---
src/site/apt/contributing.apt | 84
src/site/apt/documentation.apt | 28 --
src/site/apt/examples/guess.apt| 14 ---
src/site/apt/extensions/index.apt | 26 -
src/site/apt/index.apt | 82 ---
src/site/apt/irc.apt | 28 --
src/site/apt/jakarta.apt | 110 -
src/site/apt/jsr299.apt| 29 --
src/site/apt/jsr330.apt| 25 -
src/site/apt/trademarks.apt| 30 --
src/site/fml/faq.fml | 66 -
src/site/resources/documents/userguide.pdf | Bin 91264 -> 0 bytes
.../resources/images/logos/openwebbeans_hor.png| Bin 9749 -> 0 bytes
.../resources/images/logos/openwebbeans_small.png | Bin 6888 -> 0 bytes
.../resources/images/logos/openwebbeans_vert.png | Bin 7763 -> 0 bytes
src/site/site.xml | 62
16 files changed, 584 deletions(-)
diff --git a/src/site/apt/contributing.apt b/src/site/apt/contributing.apt
deleted file mode 100644
index 63a5cedf5..0
--- a/src/site/apt/contributing.apt
+++ /dev/null
@@ -1,84 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with this
-~~ work for additional information regarding copyright ownership. The ASF
-~~ licenses this file to You 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.
-Contributing to OpenWebBeans
-
- We are always looking for new contributors to the project.
-
-
-* Mailing Lists
-
- Please join our discussions about the project in our mailing lists by
- sending an informal email to
-
-
-user-subscr...@openwebbeans.apache.org
-
-
- for any usage specific questions, and
-
-
-dev-subscr...@openwebbeans.apache.org
-
-
- for bugs and feature discussions.
-
-
-* Issue Tracking
-
- Bug reports and feature requests will be maintained via JIRA at
-
-
{{{https://issues.apache.org/jira/browse/OWB}https://issues.apache.org/jira/browse/OWB}}
-
-
-* Source Repository
-
- The sources of Apache OpenWebBeans are maintained in the Apache Software
Foundation
- Subversion repository.
-
- The sources can be checked out read only with the following command:
-
-
-svn co http://svn.apache.org/repos/asf/openwebbeans/trunk openwebbeans
-
-
- If you have commit rights, then you should use
-
-
-svn co https://svn.apache.org/repos/asf/openwebbeans/trunk openwebbeans
-
-
-
-* Building OpenWebBeans
-
- Apache OpenWebBeans can be built by using Apache Maven. Just go into the
- source directory and execute
-
-
-mvn clean install
-
-
- The following maven profiles exist in our build to trigger additional
- build steps and configuration:
-
- * tck - for executing the JSR-299 standalone TCK
-
- * jsr330-tck - for executing the JSR-330 TCK
-
- * doc - for building the documentation PDF from docbook
-
- []
-
- To activate all of them use
-
-
-mvn clean install -Ptck -Pjsr330-tck -Pdoc
-
diff --git a/src/site/apt/documentation.apt b/src/site/apt/documentation.apt
deleted file mode 100644
index 55395849f..0
--- a/src/site/apt/documentation.apt
+++ /dev/null
@@ -1,28 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with this
-~~ work for additional information regarding copyright ownership. The ASF
-~~ licenses this file to You 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
[openwebbeans] 02/03: OWB-1417 fix atinject TCK
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 f7411b833da3bb3dfb7abbec70272a618f4beb2c
Author: Mark Struberg
AuthorDate: Tue Jan 24 19:06:02 2023 +0100
OWB-1417 fix atinject TCK
---
atinject-tck/pom.xml | 23 --
...roducer.java => AtinjectTckSetupExtension.java} | 52 ++
.../atinject/tck/specific/SpecificProducer.java| 11 ++---
.../webbeans/atinject/tck/specific/TckNew.java | 37 +++
.../jakarta.enterprise.inject.spi.Extension| 18
pom.xml| 1 +
6 files changed, 84 insertions(+), 58 deletions(-)
diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml
index 56c2ddabf..9847e747d 100644
--- a/atinject-tck/pom.xml
+++ b/atinject-tck/pom.xml
@@ -28,9 +28,9 @@
atinject-tck
-OWB JSR-330 TCK
+OWB JSR-330 Jakarta version TCK
jar
-Apache OpenWebBeans JSR-330 TCK Suite
+Apache OpenWebBeans Jakarta-Inject TCK Suite
@@ -52,7 +52,7 @@
jakarta.inject
jakarta.inject-tck
-1
+2.0.1
test
@@ -66,34 +66,27 @@
jakarta.annotation
jakarta.annotation-api
-
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${geronimo_atinject.version}
-provided
+jakarta.inject
+jakarta.inject-api
-
jakarta.enterprise
jakarta.enterprise.cdi-api
-
jakarta.interceptor
jakarta.interceptor-api
-
-org.apache.geronimo.specs
-geronimo-el_2.2_spec
+jakarta.el
+jakarta.el-api
-
+
org.apache.openwebbeans
openwebbeans-spi
-
org.apache.openwebbeans
openwebbeans-impl
diff --git
a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/AtinjectTckSetupExtension.java
similarity index 53%
copy from
atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
copy to
atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/AtinjectTckSetupExtension.java
index cb10c7a26..44a2ea66c 100644
---
a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
+++
b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/AtinjectTckSetupExtension.java
@@ -18,49 +18,25 @@
*/
package org.apache.webbeans.atinject.tck.specific;
+import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Typed;
-import jakarta.enterprise.inject.Default;
-import jakarta.enterprise.inject.New;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Named;
-
-import org.atinject.tck.auto.Drivers;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
import org.atinject.tck.auto.DriversSeat;
-import org.atinject.tck.auto.Seat;
import org.atinject.tck.auto.accessories.SpareTire;
-
-public class SpecificProducer
+/**
+ * Fixes some setup weirdness which got created after removal of @New
+ */
+public class AtinjectTckSetupExtension implements Extension
{
-public SpecificProducer()
-{
-
-}
-
-@Produces @Drivers
-public Seat produceDrivers(@New DriversSeat seat)
-{
-return seat;
-}
-
-
-@Produces @DriverBinding @Typed(value={DriversSeat.class})
-public DriversSeat produceDriverSeat(@New DriversSeat seat)
-{
-return seat;
-}
-
-
-@Produces @Named("spare") @SpareBinding
-public SpareTire produceSpare(@New SpareTire tire)
+public void initTckBeans(@Observes BeforeBeanDiscovery bbd)
{
-return tire;
-}
-
-@Produces @Default @Typed(value={SpareTire.class})
-public SpareTire produceSpareTire(@New SpareTire tire)
-{
-return tire;
+bbd.addAnnotatedType(DriversSeat.class, "tck")
+.add(Typed.Literal.of(new Class[]{DriversSeat.class}));
+
+bbd.addAnnotatedType(SpareTire.class, "tck")
+.add(new AnnotationLiteral() {});
}
-
}
diff --git
a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
index cb10c7a26..1c54231bf 100644
---
a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/spec
[openwebbeans] 03/03: OWB-1417 remove webbeans-resources module
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 78050fea75592ee2a312c77cfe18723570fa78fd
Author: Mark Struberg
AuthorDate: Tue Jan 24 19:06:32 2023 +0100
OWB-1417 remove webbeans-resources module
This was used to 'fake' Java EE @Resource injection.
But it was not really working in a portable way anyway.
---
webbeans-resource/pom.xml | 78 -
.../spi/se/StandaloneResourceInjectionService.java | 173
.../spi/se/StandaloneResourceProcessor.java| 179 -
.../META-INF/openwebbeans/openwebbeans.properties | 30
webbeans-resource/src/site/site.xml| 47 --
5 files changed, 507 deletions(-)
diff --git a/webbeans-resource/pom.xml b/webbeans-resource/pom.xml
deleted file mode 100644
index be7c9edcc..0
--- a/webbeans-resource/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
-4.0.0
-
-org.apache.openwebbeans
-openwebbeans
-4.0.0-SNAPSHOT
-
-openwebbeans-resource
-EE Resource plugin
-Apache OpenWebBeans EE Resource Integration
-
-
-
-org.apache.openwebbeans
-openwebbeans-impl
-
-
-
-org.apache.geronimo.specs
-geronimo-jpa_2.0_spec
-true
-
-
-
-org.apache.geronimo.specs
-geronimo-jcdi_2.0_spec
-true
-
-
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-true
-
-
-jakarta.annotation
-jakarta.annotation-api
-true
-
-
-
-org.apache.geronimo.specs
-geronimo-jaxws_2.2_spec
-true
-
-
-org.apache.openwebbeans
-openwebbeans-spi
-true
-
-
-
-junit
-junit
-
-
-
-
-
diff --git
a/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
b/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
deleted file mode 100644
index 798309b45..0
---
a/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.webbeans.resource.spi.se;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.text.MessageFormat;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jakarta.annotation.Resource;
-import jakarta.enterprise.inject.Produces;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import javax.xml.ws.WebServiceRef;
-
-import org.apache.webbeans.config.OWBLogConst;
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.exception.WebBeansException;
-import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import org.apache.webbeans.spi.ResourceInjectionService;
-import org.apache.webbeans.spi.api.ResourceReference;
-import org.apache.webbeans.util.AnnotationUtil;
-
-public class StandaloneResourceInjectionService implements
ResourceInjectionService
-{
-/**
- * When ResourceProxyHandler deserialized, this will instruct owb to
create a new actual instance, if
- * the actual resource is not serializable.
- */
-private static final String DUMMY_STRING = "owb.actual.resource.dummy";
-
-private final StandaloneResourceProcessor processor =
StandaloneResourceProcessor.getProcessor();
-
-private static final Logg
[openwebbeans] branch main updated: OWB-1417 enable owb-ejb and owb-porting
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 4f4688575 OWB-1417 enable owb-ejb and owb-porting
4f4688575 is described below
commit 4f4688575b49768f359c6acef9cd8d8853abe928
Author: Mark Struberg
AuthorDate: Tue Jan 24 17:25:05 2023 +0100
OWB-1417 enable owb-ejb and owb-porting
---
pom.xml| 24 ++--
webbeans-ejb/pom.xml | 32 +++---
.../webbeans/ejb/common/util/EjbConstants.java | 1 -
.../webbeans/ejb/common/util/EjbValidator.java | 1 -
.../ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java | 5 +-
.../apache/webbeans/util/WebBeansConstants.java| 8 +-
webbeans-porting/pom.xml | 125 -
7 files changed, 133 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2496a5027..9b3421bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
4.0.0
2.0.0
3.0.0
+4.0.0
10.1.5
@@ -102,7 +103,7 @@
9.4.12.v20180830
2.3.6
-2.0.5.Final
+4.0.7
2.4
2.2
@@ -757,10 +758,12 @@
webbeans-se
webbeans-web
webbeans-tomcat
+webbeans-ejb
webbeans-arquillian
webbeans-slf4j
webbeans-gradle
webbeans-junit5
+webbeans-porting
+
org.apache.geronimo.specs
geronimo-jaxws_2.2_spec
@@ -856,11 +869,6 @@
-
-org.apache.geronimo.specs
-geronimo-ejb_3.1_spec
-${geronimo_ejb.version}
-
diff --git a/webbeans-ejb/pom.xml b/webbeans-ejb/pom.xml
index faf40c531..ffc3bc945 100644
--- a/webbeans-ejb/pom.xml
+++ b/webbeans-ejb/pom.xml
@@ -26,27 +26,28 @@
openwebbeans-ejb
EJB plugin
Apache OpenWebBeans Java EE EJB plugin
-
-
-org.apache.openwebbeans
-openwebbeans-impl
-
+
-jakarta.interceptor
-jakarta.interceptor-api
+jakarta.inject
+jakarta.inject-api
provided
-
jakarta.enterprise
jakarta.enterprise.cdi-api
+provided
-
-jakarta.inject
-jakarta.inject-api
+jakarta.interceptor
+jakarta.interceptor-api
+provided
+
+
+jakarta.ejb
+jakarta.ejb-api
+provided
@@ -54,17 +55,16 @@
openwebbeans-spi
true
+
+org.apache.openwebbeans
+openwebbeans-impl
+
junit
junit
-
-org.apache.geronimo.specs
-geronimo-ejb_3.1_spec
-provided
-
diff --git
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
index 338ab39fe..66b72c4f2 100644
---
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
+++
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
@@ -19,7 +19,6 @@
package org.apache.webbeans.ejb.common.util;
/**
- * @version $Rev: 889852 $ $Date: 2009-12-12 01:11:53 +0200 (Sat, 12 Dec 2009)
$
*/
public final class EjbConstants
{
diff --git
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
index 6c3f24a3a..b990a3b83 100644
---
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
+++
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
@@ -43,7 +43,6 @@ import org.apache.webbeans.util.Asserts;
/**
* Validates session beans.
*
- * @version $Rev: 915746 $ $Date: 2010-02-24 12:43:43 +0200 (Wed, 24 Feb 2010)
$
*/
public final class EjbValidator
{
diff --git
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
index e50d79d7c..45e9f63d5 100644
---
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
+++
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.ejb.plugin;
import java.lang.annotation.Annotation;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import
[openwebbeans] 02/02: OWB1417 inline checkstyle config for now
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 494886565d71a329f54c84f40ce968860e7dc2e9 Author: Mark Struberg AuthorDate: Tue Jan 24 15:43:31 2023 +0100 OWB1417 inline checkstyle config for now --- pom.xml | 199 1 file changed, 187 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 4c23da20b..2496a5027 100644 --- a/pom.xml +++ b/pom.xml @@ -442,25 +442,200 @@ maven-checkstyle-plugin 2.17 - -verify-style -verify -check - + +verify-style +verify +check
[openwebbeans] branch main updated (c7469aa50 -> 494886565)
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 c7469aa50 OWB-1417 re-enable slf4j plugin
new e9884e292 OWB-1417 enable owb-gradle and owb-junit5
new 494886565 OWB1417 inline checkstyle config for now
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| 204 +++--
.../openwebbeans/junit5/internal/CdiExtension.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
3 files changed, 190 insertions(+), 16 deletions(-)
rename
webbeans-junit5/src/test/resources/META-INF/services/{javax.enterprise.inject.spi.Extension
=> jakarta.enterprise.inject.spi.Extension} (100%)
[openwebbeans] 01/02: OWB-1417 enable owb-gradle and owb-junit5
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 e9884e2925b6fbe449de9d7c7c9db1c8dda4b8a1
Author: Mark Struberg
AuthorDate: Tue Jan 24 15:22:16 2023 +0100
OWB-1417 enable owb-gradle and owb-junit5
---
pom.xml | 5 ++---
.../java/org/apache/openwebbeans/junit5/internal/CdiExtension.java | 2 +-
inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} | 0
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f57cb693..4c23da20b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,9 +584,10 @@
webbeans-tomcat
webbeans-arquillian
webbeans-slf4j
+webbeans-gradle
+webbeans-junit5
diff --git
a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
index ea47c0611..6f68cd2e3 100644
---
a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
+++
b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
@@ -138,7 +138,7 @@ public class CdiExtension extends
CdiParametersResolverExtension implements Befo
{
final BeanManager manager = container.getBeanManager();
final AnnotatedType annotatedType =
manager.createAnnotatedType(instance.getClass());
-final InjectionTarget injectionTarget =
manager.createInjectionTarget(annotatedType);
+final InjectionTarget injectionTarget =
manager.getInjectionTargetFactory(annotatedType).createInjectionTarget(null);
final CreationalContext creationalContext =
manager.createCreationalContext(null);
creationalContexts.add(creationalContext);
injectionTarget.inject(instance, creationalContext);
diff --git
a/webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from
webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to
webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
[openwebbeans] branch main updated: OWB-1417 re-enable slf4j plugin
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 c7469aa50 OWB-1417 re-enable slf4j plugin c7469aa50 is described below commit c7469aa50067d67ed34835d245060b00902fb3f3 Author: Mark Struberg AuthorDate: Tue Jan 24 10:42:04 2023 +0100 OWB-1417 re-enable slf4j plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 320534e2a..6f57cb693 100644 --- a/pom.xml +++ b/pom.xml @@ -583,6 +583,7 @@ webbeans-web webbeans-tomcat webbeans-arquillian +webbeans-slf4j
[openwebbeans] 03/05: OWB-1417 re-enable more owb modules
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 8eef18a9884ef1b08a32005de2f4b140bc610ef3
Author: Mark Struberg
AuthorDate: Mon Jan 23 23:26:31 2023 +0100
OWB-1417 re-enable more owb modules
---
pom.xml| 123 -
.../apache/webbeans/sample/bean/LogoutBean.java| 2 +-
samples/jsf2sample/pom.xml | 2 +-
samples/reservation/pom.xml| 2 +-
.../webbeans/reservation/beans/LogoutBean.java | 2 +-
.../webbeans/reservation/util/JSFUtility.java | 2 +-
.../webbeans/samples/tomcat/InjectorServlet.java | 8 +-
.../apache/webbeans/samples/tomcat/MyFilter.java | 12 +-
.../owb-arquillian-standalone/pom.xml | 11 +-
webbeans-el22/pom.xml | 43 ---
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../webbeans/web/jetty9/JettySecurityFilter.java | 14 +--
.../apache/webbeans/web/jetty9/JettyWebPlugin.java | 20 ++--
.../webbeans/web/jetty9/OwbConfiguration.java | 4 +-
.../test/JettyNormalScopeProxyFactoryTest.java | 4 +-
webbeans-jsf/pom.xml | 2 +-
.../main/java/org/apache/webbeans/jsf/JSFUtil.java | 2 +-
webbeans-osgi/pom.xml | 2 +-
.../osgi/scanner/OsgiMetaDataScannerService.java | 2 +-
webbeans-porting/pom.xml | 6 +-
webbeans-se/pom.xml| 84 +++---
.../org/apache/openwebbeans/se/OWBContainer.java | 14 +++
...ta.enterprise.inject.se.SeContainerInitializer} | 0
.../java/org/apache/openwebbeans/se/CDISETest.java | 2 +-
webbeans-tck/pom.xml | 6 +-
{webbeans-tomcat7 => webbeans-tomcat}/pom.xml | 46
.../src/it/fatwar/pom.xml | 0
.../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +-
.../webbeans/web/tomcat7/test/TestRequestBean.java | 0
.../webbeans/web/tomcat7/test/TestServlet.java | 14 +--
.../webbeans/web/tomcat7/test/TestSessionBean.java | 0
.../it/fatwar/src/main/webapp/META-INF/context.xml | 0
.../it/fatwar/src/main/webapp/WEB-INF/beans.xml| 0
.../src/it/fatwar/src/main/webapp/WEB-INF/web.xml | 0
.../web/tomcat7/test/OwbTomcatPluginIT.java| 0
.../src/it/servletinjection/pom.xml| 0
.../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +-
.../webbeans/web/tomcat7/test/TestServlet.java | 12 +-
.../src/main/webapp/META-INF/context.xml | 2 +-
.../src/main/webapp/WEB-INF/beans.xml | 0
.../src/main/webapp/WEB-INF/web.xml| 0
.../web/tomcat7/test/OwbTomcatPluginIT.java| 0
.../src/it/settings.xml| 0
.../web/tomcat}/ContextLifecycleListener.java | 8 +-
.../web/tomcat}/TomcatInstanceManager.java | 2 +-
.../webbeans/web/tomcat}/TomcatSecurityFilter.java | 16 +--
.../web/tomcat}/TomcatSecurityService.java | 2 +-
.../apache/webbeans/web/tomcat}/TomcatUtil.java| 2 +-
.../webbeans/web/tomcat}/TomcatWebPlugin.java | 22 ++--
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
apache.webbeans.spi.plugins.OpenWebBeansPlugin | 2 +-
.../src/main/resources/META-INF/web-fragment.xml | 2 +-
.../src/site/site.xml | 0
.../webbeans/web/tomcat}/test/MySessionScoped.java | 2 +-
.../webbeans/web/tomcat}/test/MyWrapper.java | 2 +-
.../test/TomcatNormalScopeProxyFactoryTest.java| 12 +-
webbeans-web/pom.xml | 80 ++
.../org/apache/openwebbeans/web/it/ForwardIT.java | 2 +-
.../src/main/java/org/superbiz/TestServlet.java| 10 +-
.../conversation/ConversationITServlet.java| 10 +-
.../openwebbeans/web/it/ConversationScopedIT.java | 2 +-
.../openwebbeans/web/it/RequestScopedIT.java | 2 +-
.../servlet/WebBeansConfigurationFilter.java | 18 +--
.../WebBeansConfigurationHttpSessionListener.java | 4 +-
.../servlet/WebBeansConfigurationListener.java | 16 +--
.../web/context/ServletRequestContext.java | 2 +-
.../webbeans/web/context/WebContextsService.java | 8 +-
.../web/context/WebConversationFilter.java | 12 +-
.../web/context/WebConversationService.java| 6 +-
.../webbeans/web/lifecycle/ServletContextBean.java | 2 +-
.../webbeans/web/lifecycle/ServletRequestBean.java |
[openwebbeans] 05/05: OWB-1417 use arquillian enricher for jakarta
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 3002d08b7559f6af2f6ec0e3d775bd54c1a328a4
Author: Mark Struberg
AuthorDate: Tue Jan 24 09:57:50 2023 +0100
OWB-1417 use arquillian enricher for jakarta
---
pom.xml | 2 +-
webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c98012a4d..320534e2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
4.5.14
4.22
-1.7.0.Alpha10
+1.7.0.Alpha13
1.2
diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
index 9d60d00aa..3fe8f61fc 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
+++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
@@ -76,7 +76,7 @@
org.jboss.arquillian.testenricher
-arquillian-testenricher-cdi
+arquillian-testenricher-cdi-jakarta
${arquillian.version}
[openwebbeans] branch main created (now 3002d08b7)
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 at 3002d08b7 OWB-1417 use arquillian enricher for jakarta This branch includes the following new commits: new 6cc7ac227 OWB-1417 bump version to 4.0.0-SNAPSHOT new f82969b2e OWB-1417 move core parts to CDI-4.0 new 8eef18a98 OWB-1417 re-enable more owb modules new c7c521074 OWB-1417 Fix diff in Session Persistence behaviour of tc10 new 3002d08b7 OWB-1417 use arquillian enricher for jakarta The 5 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.
[openwebbeans] 04/05: OWB-1417 Fix diff in Session Persistence behaviour of tc10
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 c7c521074f138902d462e7ae0f1cc898bfc4ecea
Author: Mark Struberg
AuthorDate: Tue Jan 24 09:49:45 2023 +0100
OWB-1417 Fix diff in Session Persistence behaviour of tc10
---
.../tomcat/test/TomcatNormalScopeProxyFactoryTest.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
index c53c33ce8..6d51d1796 100644
---
a/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
+++
b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
@@ -22,6 +22,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.session.FileStore;
+import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.webbeans.config.WebBeansContext;
@@ -65,7 +67,14 @@ public class TomcatNormalScopeProxyFactoryTest
tomcat.setPort(0);
tomcat.setBaseDir(base.getAbsolutePath());
+
final Context ctx = tomcat.addContext("/test",
war.getAbsolutePath());
+
+//required to persist state during restart
+final PersistentManager persistentManager = new
PersistentManager();
+final FileStore fileStore = new FileStore();
+persistentManager.setStore(fileStore);
+ctx.setManager(persistentManager);
ctx.addLifecycleListener(new ContextLifecycleListener());
// needed for Java9
@@ -94,17 +103,16 @@ public class TomcatNormalScopeProxyFactoryTest
final BeanManager bm = CDI.current().getBeanManager();
final Response response = new Response();
-//Xresponse.setConnector(tomcat.getConnector());
response.setCoyoteResponse(new
org.apache.coyote.Response());
final Request request = new Request(tomcat.getConnector());
-//X request.setContext(ctx);
+request.getMappingData().context = ctx;
request.setResponse(response);
request.setRequestedSessionId(sessionId);
+response.setRequest(request);
final ContextsService contextsService =
WebBeansContext.currentInstance().getContextsService();
final ServletRequestEvent startParameter = new
ServletRequestEvent(ctx.getServletContext(), request);
-contextsService.startContext(RequestScoped.class,
startParameter);
if (request.getSession() != null)
{
contextsService.startContext(SessionScoped.class,
request.getSession());
@@ -124,9 +132,6 @@ public class TomcatNormalScopeProxyFactoryTest
// don't do to not destroy the instance
// contextsService.endContext(SessionScoped.class,
request.getSession());
}
-catch (Exception e) {
-log.log(Level.SEVERE, "Exception during test execution",
e);
-}
finally
{
thread.setContextClassLoader(old);
@@ -136,6 +141,7 @@ public class TomcatNormalScopeProxyFactoryTest
{
try
{
+ctx.getManager().unload();;
tomcat.stop();
}
catch (Exception e)
[openwebbeans] 01/05: OWB-1417 bump version to 4.0.0-SNAPSHOT
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 6cc7ac227c536f81678a22cb889b3174dbb79b6a Author: Mark Struberg AuthorDate: Sun Jan 22 16:18:12 2023 +0100 OWB-1417 bump version to 4.0.0-SNAPSHOT --- atinject-tck/pom.xml | 2 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 2 +- samples/conversation-sample/pom.xml | 2 +- samples/guess/pom.xml | 2 +- samples/jsf2sample/pom.xml| 2 +- samples/pom.xml | 2 +- samples/reservation/pom.xml | 2 +- samples/standalone-sample/pom.xml | 2 +- samples/tomcat7-sample/pom.xml| 2 +- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jetty9/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-resource/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck-jakarta/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat7/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 35bc036f3..2743c50d0 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT ../pom.xml diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml index 816375a7f..edc25b6b2 100644 --- a/bom/openwebbeans-se-bom/pom.xml +++ b/bom/openwebbeans-se-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT 4.0.0 diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml index caa4bd113..c2536d5e3 100644 --- a/bom/openwebbeans-web-bom/pom.xml +++ b/bom/openwebbeans-web-bom/pom.xml @@ -19,7 +19,7 @@ bom org.apache.openwebbeans.bom -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index f37f9fe27..bf0aacc41 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,7 +19,7 @@ openwebbeans org.apache.openwebbeans -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 62f735f74..c5e5d2e88 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1f7dcc03d..beef082df 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ openwebbeans Apache OpenWebBeans pom -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT openwebbeans.apache.org diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml index d8d03d973..f44fe711d 100644 --- a/samples/conversation-sample/pom.xml +++ b/samples/conversation-sample/pom.xml @@ -23,7 +23,7 @@ under the License. samples org.apache.openwebbeans -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT ../pom.xml diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml index c160edccd..1b18a22d9 100644 --- a/samples/guess/pom.xml +++ b/samples/guess/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans samples -2.0.28-SNAPSHOT +4.0.0-SNAPSHOT ../pom.xml diff --git a/samples/jsf2sample/pom.xml b
[openwebbeans] branch master updated: upgrade to apache-parent 29
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git The following commit(s) were added to refs/heads/master by this push: new 0376bd705 upgrade to apache-parent 29 0376bd705 is described below commit 0376bd705f7373336667a47ed05f9614ebb31f91 Author: Mark Struberg AuthorDate: Sun Jan 22 16:14:34 2023 +0100 upgrade to apache-parent 29 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6df59f0b9..1f7dcc03d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache -23 +29
[openwebbeans-site] branch main updated: update download page
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-site.git The following commit(s) were added to refs/heads/main by this push: new 56b588d update download page 56b588d is described below commit 56b588d69a5cd52940dbdd007c690da560192c1c Author: Mark Struberg AuthorDate: Sun Jan 22 15:45:03 2023 +0100 update download page --- content/download.md | 19 +-- content/index.ezmd | 6 +++--- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/content/download.md b/content/download.md index 83f93fb..9d438d0 100644 --- a/content/download.md +++ b/content/download.md @@ -19,22 +19,13 @@ Read more about [How to verify downloaded files](https://www.apache.org/info/ver OWB-2.0.x implements the CDI-2.0 (JSR-365) specification. It uses a shaded version of ASM-8 (Java11 support) for building our proxies and requires JavaSE 8 as minimum version. - Binaries -The binary distribution contains all OpenWebBeans modules. - -* [openwebbeans-distribution-2.0.23-binary.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.zip) -* [openwebbeans-distribution-2.0.23-binary.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.zip.sha512) -* [openwebbeans-distribution-2.0.23-binary.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.zip.asc) -* [openwebbeans-distribution-2.0.23-binary.tar.gz](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.tar.gz) -* [openwebbeans-distribution-2.0.23-binary.tar.gz.sha512](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.tar.gz.sha512) -* [openwebbeans-distribution-2.0.23-binary.tar.gz.asc](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-distribution-2.0.23-binary.tar.gz.asc) - Source -Should you want to build any of the above binaries, this source bundle is the right one and covers them all. +The source distribution contains all OpenWebBeans source code. +Binaries are available via the Apache Maven Central repository. -* [openwebbeans-2.0.23-source-release.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.23/openwebbeans-2.0.23-source-release.zip) -* [openwebbeans-2.0.23-source-release.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-2.0.23-source-release.zip.sha512) -* [openwebbeans-2.0.23-source-release.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.23/openwebbeans-2.0.23-source-release.zip.asc) +* [openwebbeans-2.0.27-source-release.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.27/openwebbeans-2.0.27-source-release.zip) +* [openwebbeans-2.0.27-source-release.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.27/openwebbeans-2.0.27-source-release.zip.sha512) +* [openwebbeans-2.0.27-source-release.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.27/openwebbeans-2.0.27-source-release.zip.asc) -- diff --git a/content/index.ezmd b/content/index.ezmd index e7e124e..dae5d2e 100644 --- a/content/index.ezmd +++ b/content/index.ezmd @@ -29,13 +29,13 @@ asf_headings: False -Getting Started +Getting Started with CDI OpenWebBeans is packaged as modules which get activated by simply dropping them into the classpath. The below link will take you to a step-by-step guide and get you started in no time! View details » -Meecrowave -Apache Meecrowave is a microprofile Server based on Apache OpenWebBeans, Tomcat, CXF and Johnzon +Meecrowave Server +Apache Meecrowave is a Microprofile Server based on Apache OpenWebBeans, Tomcat, CXF and Johnzon In other words it contains all you need to run a JavaEE based Microservice from the command line - and all that in only 9 MB! View details »
[openwebbeans-meecrowave] branch master updated: update our site configuration and fresh content
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 3e0a6a5 update our site configuration and fresh content
3e0a6a5 is described below
commit 3e0a6a5c778d427427114dc5bfcd9d71989ad7af
Author: Mark Struberg
AuthorDate: Sun Jan 22 13:28:02 2023 +0100
update our site configuration and fresh content
---
meecrowave-doc/pom.xml | 9 ++---
meecrowave-doc/src/main/jbake/content/download.adoc | 11 ++-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml
index a16084c..38eed7e 100644
--- a/meecrowave-doc/pom.xml
+++ b/meecrowave-doc/pom.xml
@@ -30,7 +30,7 @@
A module building the static website in
${project.build.directory}/${project.build.finalName}
To build use that command:
-$ mvn clean compile scm-publish:publish-scm [-Djbake.updatedownloads=true]
+$ mvn clean package scm-publish:publish-scm [-Djbake.updatedownloads=true]
@@ -191,12 +191,15 @@
org.apache.maven.plugins
maven-scm-publish-plugin
-1.0-beta-2
+3.1.0
${project.build.directory}/${project.build.finalName}
-
scm:svn:https://svn.apache.org/repos/infra/websites/production/openwebbeans/content/meecrowave
+
scm:git:https://gitbox.apache.org/repos/asf/openwebbeans-site.git
+ main
true
${project.parent.basedir}/.site-content
+ true
+ /content/meecrowave
diff --git a/meecrowave-doc/src/main/jbake/content/download.adoc
b/meecrowave-doc/src/main/jbake/content/download.adoc
index 856f0c8..0fadc3d 100755
--- a/meecrowave-doc/src/main/jbake/content/download.adoc
+++ b/meecrowave-doc/src/main/jbake/content/download.adoc
@@ -12,7 +12,16 @@ License under Apache License v2 (ALv2).
[.table.table-bordered,options="header"]
|===
|Name|Version|Date|Size|Type|Links
-|Meecrowave Source Release|1.2.12|2021-08-02 07:50:15|1 MB 567 kB|zip|
http://www.apache.org/dyn/closer.lua/openwebbeans/meecrowave/1.2.12/meecrowave-1.2.12-source-release.zip[icon:download[]
zip]
https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.12/meecrowave-1.2.12-source-release.zip.sha512[icon:download[]
sha512]
https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.12/meecrowave-1.2.12-source-release.zip.asc[icon:download[]
asc]
+|Meecrowave Source Release|1.2.15|2022-12-27 22:42:51|1 MB 567 kB|zip|
http://www.apache.org/dyn/closer.lua/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip[icon:download[]
zip]
https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512[icon:download[]
sha512]
https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc[icon:download[]
asc]
+|Meecrowave core runner|1.2.15|2022-12-27 22:44:07|10 MB 449 kB|jar|
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar[icon:download[]
jar]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar.sha1[icon:download[]
sha1]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar.asc[icon:download[]
asc]
+|Meecrowave core|1.2.15|2022-12-27 22:44:04|217 kB|jar|
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar[icon:download[]
jar]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar.sha1[icon:download[]
sha1]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar.asc[icon:download[]
asc]
+|Meecrowave Source Release|1.2.14|2022-04-30 13:03:09|1 MB 567 kB|zip|
https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip[icon:download[]
zip]
https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip.sha512[icon:download[]
sha512]
https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip.asc[icon:download[]
asc]
+|Meecrowave core runner|1.2.14|2022-04-30 13:04:19|10 MB 358 kB|jar|
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14-runner.jar[icon:download[]
jar]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14-runner.jar.sha1[icon:download[]
sha1]
https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-c
svn commit: r1082012 - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ meecrow
Author: struberg Date: Sat Jan 21 14:48:39 2023 New Revision: 1082012 Log: upgrade download page Modified: websites/production/openwebbeans/content/meecrowave/community.pdf websites/production/openwebbeans/content/meecrowave/companion-projects.pdf websites/production/openwebbeans/content/meecrowave/components.pdf websites/production/openwebbeans/content/meecrowave/download.html websites/production/openwebbeans/content/meecrowave/download.pdf websites/production/openwebbeans/content/meecrowave/howto.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf websites/production/openwebbeans/content/meecrowave/start.pdf websites/production/openwebbeans/content/meecrowave/testing/index.html websites/production/openwebbeans/content/meecrowave/testing/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/companion-projects.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/components.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/download.html == --- websites/production/openwebbeans/content/meecrowave/download.html (original) +++ websites/production/openwebbeans/content/meecrowave/download.html Sat Jan 21 14:48:39 2023 @@ -91,6 +91,30 @@ Meecrowave Source Release +1.2.15 +2022-12-27 22:42:51 +1 MB 567 kB +zip +http://www.apache.org/dyn/closer.lua/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip;> zip https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512;> sha512 https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc;> asc + + +Meecrowave core runner +1.2.15 +2022-12-27 22:44:07 +10 MB 449 kB +jar +https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar.sha1;> sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15-runner.jar.asc;> asc + + +Meecrowave core +1.2.15 +2022-12-27 22:44:04 +217 kB +jar +https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar.sha1;> sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.15/meecrowave-core-1.2.15.jar.asc;> asc + + +Meecrowave Source Release 1.2.14 2022-04-30 13:03:09 1 MB 567 kB Modified: websites/production/openwebbeans/content/meecrowave/download.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
svn commit: r1082008 - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ meecrow
Author: struberg Date: Fri Jan 20 21:17:46 2023 New Revision: 1082008 Log: update site after release Added: websites/production/openwebbeans/content/meecrowave/howto.pdf (with props) websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf (with props) websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf (with props) websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf (with props) websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf (with props) websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf (with props) websites/production/openwebbeans/content/meecrowave/start.pdf (with props) Modified: websites/production/openwebbeans/content/meecrowave/community.pdf websites/production/openwebbeans/content/meecrowave/companion-projects.pdf websites/production/openwebbeans/content/meecrowave/components.pdf websites/production/openwebbeans/content/meecrowave/download.html websites/production/openwebbeans/content/meecrowave/download.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf websites/production/openwebbeans/content/meecrowave/testing/index.html websites/production/openwebbeans/content/meecrowave/testing/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/companion-projects.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/components.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/download.html == --- websites/production/openwebbeans/content/meecrowave/download.html (original) +++ websites/production/openwebbeans/content/meecrowave/download.html Fri Jan 20 21:17:46 2023 @@ -91,11 +91,59 @@ Meecrowave Source Release +1.2.14 +2022-04-30 13:03:09 +1 MB 567 kB +zip +https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip;> zip https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip.sha512;> sha512 https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.14/meecrowave-1.2.14-source-release.zip.asc;> asc + + +Meecrowave core runner +1.2.14 +2022-04-30 13:04:19 +10 MB 358 kB +jar +https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14-runner.jar.sha1;> sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14-runner.jar.asc;> asc + + +Meecrowave core +1.2.14 +2022-04-30 13:04:18 +218 kB +jar +https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14.jar.sha1;> sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.14/meecrowave-core-1.2.14.jar.asc;> asc + + +Meecrowave Source Release +1.2.13 +2021-12-14 22:10:42 +1 MB 567 kB +zip +https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.13/meecrowave-1.2.13-source-release.zip;> zip https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.13/meecrowave-1.2.13-source-release.zip.sha512;> sha512 https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.13/meecrowave-1.2.13-source-release.zip.asc;> asc + + +Meecrowave core runner +1.2.13 +2021-12-14 22:11:54 +10 MB 318 kB +jar +https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.13/meecrowave-core-1.2.13-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.13/meecrowave-core-1.2.13-runner.jar.sha1;> sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.13/meecrowave-core-1.2.13-runner.jar.asc;> asc + + +Meecrowave core +1.2.
svn commit: r59507 - in /release/openwebbeans/meecrowave: 1.2.14/ 1.2.15/
Author: struberg Date: Fri Jan 20 20:42:26 2023 New Revision: 59507 Log: adding Apache Meecrowave 1.2.15 Added: release/openwebbeans/meecrowave/1.2.15/ release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512 Removed: release/openwebbeans/meecrowave/1.2.14/ Added: release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip == --- release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip (added) +++ release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip Fri Jan 20 20:42:26 2023 @@ -0,0 +1,17 @@ + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip not found in group repository Public Repositories [id=public]. + + +https://repository.apache.org/favicon.png;> + + +https://repository.apache.org/static/css/Sonatype-content.css?2.14.20-02; type="text/css" media="screen" title="no title" charset="utf-8"> + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip not found in group repository Public Repositories [id=public]. +Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip not found in group repository Public Repositories [id=public]. + + Added: release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc == --- release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc (added) +++ release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc Fri Jan 20 20:42:26 2023 @@ -0,0 +1,17 @@ + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc not found in group repository Public Repositories [id=public]. + + +https://repository.apache.org/favicon.png;> + + +https://repository.apache.org/static/css/Sonatype-content.css?2.14.20-02; type="text/css" media="screen" title="no title" charset="utf-8"> + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc not found in group repository Public Repositories [id=public]. +Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.asc not found in group repository Public Repositories [id=public]. + + Added: release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 == --- release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 (added) +++ release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 Fri Jan 20 20:42:26 2023 @@ -0,0 +1,17 @@ + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 not found in group repository Public Repositories [id=public]. + + +https://repository.apache.org/favicon.png;> + + +https://repository.apache.org/static/css/Sonatype-content.css?2.14.20-02; type="text/css" media="screen" title="no title" charset="utf-8"> + + +404 - Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 not found in group repository Public Repositories [id=public]. +Path /org/apache/meecrowave/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha1 not found in group repository Public Repositories [id=public]. + + Added: release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512 == --- release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512 (added) +++ release/openwebbeans/meecrowave/1.2.15/meecrowave-1.2.15-source-release.zip.sha512 Fri Jan 20 20:42:26 2023 @@ -0,0 +1 @@ +01a362d76d9da000b590b18e058e847652a9277b60b17ec7510d16effb5e4b7df3f7bda11bb166cd24429f37620b55948453b49039da24984109dfa34f303dd1 meecrowave-1.2.15-source-release.zip
[openwebbeans-meecrowave] branch master updated: upgrade to apache parent 23
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git The following commit(s) were added to refs/heads/master by this push: new 42952e5 upgrade to apache parent 23 42952e5 is described below commit 42952e55b717b13c7727036798949205a152c2a2 Author: Mark Struberg AuthorDate: Fri Jan 20 21:27:46 2023 +0100 upgrade to apache parent 23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d1760e..98f7a39 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache apache -29 +23 org.apache.meecrowave
[openwebbeans-meecrowave] annotated tag meecrowave-1.2.15 created (now 4d6e222)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to annotated tag meecrowave-1.2.15 in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git at 4d6e222 (tag) tagging e344aae176abf3628638ac06a5d304fad27f36d7 (commit) replaces meecrowave-1.2.14 by Mark Struberg on Tue Dec 27 21:01:16 2022 +0100 - Log - [maven-release-plugin] copy for tag meecrowave-1.2.15 --- No new revisions were added by this update.
[openwebbeans-meecrowave] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git commit d589552f090489789da6dc57d6fb37e6f7da1289 Author: Mark Struberg AuthorDate: Tue Dec 27 21:01:17 2022 +0100 [maven-release-plugin] prepare for next development iteration --- integration-tests/app-groovy/pom.xml | 2 +- integration-tests/beanvalidation/pom.xml | 2 +- integration-tests/dispatch-jsp/pom.xml | 2 +- integration-tests/no-cxf/pom.xml | 2 +- integration-tests/pom.xml| 2 +- integration-tests/sse/pom.xml| 2 +- integration-tests/ssl/pom.xml| 2 +- integration-tests/webservices/pom.xml| 2 +- meecrowave-arquillian/pom.xml| 2 +- meecrowave-core/pom.xml | 2 +- meecrowave-doc/pom.xml | 2 +- meecrowave-gradle-plugin/pom.xml | 2 +- meecrowave-jpa/pom.xml | 2 +- meecrowave-jta/pom.xml | 2 +- meecrowave-junit/pom.xml | 2 +- meecrowave-letsencrypt/pom.xml | 2 +- meecrowave-maven-plugin/pom.xml | 2 +- meecrowave-oauth2-minimal/pom.xml| 2 +- meecrowave-oauth2/pom.xml| 2 +- meecrowave-proxy/pom.xml | 2 +- meecrowave-specs-api/pom.xml | 2 +- meecrowave-websocket/pom.xml | 2 +- pom.xml | 4 ++-- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/integration-tests/app-groovy/pom.xml b/integration-tests/app-groovy/pom.xml index 38171c8..bc21ba2 100644 --- a/integration-tests/app-groovy/pom.xml +++ b/integration-tests/app-groovy/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/beanvalidation/pom.xml b/integration-tests/beanvalidation/pom.xml index 2217cfc..0a9400d 100644 --- a/integration-tests/beanvalidation/pom.xml +++ b/integration-tests/beanvalidation/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/dispatch-jsp/pom.xml b/integration-tests/dispatch-jsp/pom.xml index 0eb27f0..4740e37 100644 --- a/integration-tests/dispatch-jsp/pom.xml +++ b/integration-tests/dispatch-jsp/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/no-cxf/pom.xml b/integration-tests/no-cxf/pom.xml index 60c3c6b..d496477 100644 --- a/integration-tests/no-cxf/pom.xml +++ b/integration-tests/no-cxf/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 7b8e903..31b3369 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/sse/pom.xml b/integration-tests/sse/pom.xml index 0712567..f95ccbf 100644 --- a/integration-tests/sse/pom.xml +++ b/integration-tests/sse/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/ssl/pom.xml b/integration-tests/ssl/pom.xml index 9427202..2e7dc46 100644 --- a/integration-tests/ssl/pom.xml +++ b/integration-tests/ssl/pom.xml @@ -13,7 +13,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/integration-tests/webservices/pom.xml b/integration-tests/webservices/pom.xml index f205dd8..ea193aa 100644 --- a/integration-tests/webservices/pom.xml +++ b/integration-tests/webservices/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/meecrowave-arquillian/pom.xml b/meecrowave-arquillian/pom.xml index 6841de8..a2f32da 100644 --- a/meecrowave-arquillian/pom.xml +++ b/meecrowave-arquillian/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml index 6567a64..fd062f5 100644 --- a/meecrowave-core/pom.xml +++ b/meecrowave-core/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml index 646f6cc..a16084c 100644 --- a/meecrowave-doc/pom.xml +++ b/meecrowave-doc/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/meecrowave-gradle-plugin/pom.xml b/meecrowave-gradle-plugin/pom.xml index
[openwebbeans-meecrowave] branch master updated (26708af -> d589552)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git from 26708af MEECROWAVE-324 MEECROWAVE-325 MEECROWAVE-326 various version upgrades new e344aae [maven-release-plugin] prepare release meecrowave-1.2.15 new d589552 [maven-release-plugin] prepare for next development iteration 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: integration-tests/app-groovy/pom.xml | 2 +- integration-tests/beanvalidation/pom.xml | 2 +- integration-tests/dispatch-jsp/pom.xml | 2 +- integration-tests/no-cxf/pom.xml | 2 +- integration-tests/pom.xml| 2 +- integration-tests/sse/pom.xml| 2 +- integration-tests/ssl/pom.xml| 2 +- integration-tests/webservices/pom.xml| 2 +- meecrowave-arquillian/pom.xml| 2 +- meecrowave-core/pom.xml | 2 +- meecrowave-doc/pom.xml | 2 +- meecrowave-gradle-plugin/pom.xml | 2 +- meecrowave-jpa/pom.xml | 2 +- meecrowave-jta/pom.xml | 2 +- meecrowave-junit/pom.xml | 2 +- meecrowave-letsencrypt/pom.xml | 2 +- meecrowave-maven-plugin/pom.xml | 2 +- meecrowave-oauth2-minimal/pom.xml| 2 +- meecrowave-oauth2/pom.xml| 2 +- meecrowave-proxy/pom.xml | 2 +- meecrowave-specs-api/pom.xml | 2 +- meecrowave-websocket/pom.xml | 2 +- pom.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-)
[openwebbeans-meecrowave] 01/02: [maven-release-plugin] prepare release meecrowave-1.2.15
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git commit e344aae176abf3628638ac06a5d304fad27f36d7 Author: Mark Struberg AuthorDate: Tue Dec 27 21:01:16 2022 +0100 [maven-release-plugin] prepare release meecrowave-1.2.15 --- integration-tests/app-groovy/pom.xml | 2 +- integration-tests/beanvalidation/pom.xml | 2 +- integration-tests/dispatch-jsp/pom.xml | 2 +- integration-tests/no-cxf/pom.xml | 2 +- integration-tests/pom.xml| 2 +- integration-tests/sse/pom.xml| 2 +- integration-tests/ssl/pom.xml| 2 +- integration-tests/webservices/pom.xml| 2 +- meecrowave-arquillian/pom.xml| 2 +- meecrowave-core/pom.xml | 2 +- meecrowave-doc/pom.xml | 2 +- meecrowave-gradle-plugin/pom.xml | 2 +- meecrowave-jpa/pom.xml | 2 +- meecrowave-jta/pom.xml | 2 +- meecrowave-junit/pom.xml | 2 +- meecrowave-letsencrypt/pom.xml | 2 +- meecrowave-maven-plugin/pom.xml | 2 +- meecrowave-oauth2-minimal/pom.xml| 2 +- meecrowave-oauth2/pom.xml| 2 +- meecrowave-proxy/pom.xml | 2 +- meecrowave-specs-api/pom.xml | 2 +- meecrowave-websocket/pom.xml | 2 +- pom.xml | 4 ++-- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/integration-tests/app-groovy/pom.xml b/integration-tests/app-groovy/pom.xml index c9f4b37..38171c8 100644 --- a/integration-tests/app-groovy/pom.xml +++ b/integration-tests/app-groovy/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/beanvalidation/pom.xml b/integration-tests/beanvalidation/pom.xml index 5cefeaf..2217cfc 100644 --- a/integration-tests/beanvalidation/pom.xml +++ b/integration-tests/beanvalidation/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/dispatch-jsp/pom.xml b/integration-tests/dispatch-jsp/pom.xml index c7ce3cf..0eb27f0 100644 --- a/integration-tests/dispatch-jsp/pom.xml +++ b/integration-tests/dispatch-jsp/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/no-cxf/pom.xml b/integration-tests/no-cxf/pom.xml index 3dc7473..60c3c6b 100644 --- a/integration-tests/no-cxf/pom.xml +++ b/integration-tests/no-cxf/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1d89577..7b8e903 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/sse/pom.xml b/integration-tests/sse/pom.xml index 2cd913b..0712567 100644 --- a/integration-tests/sse/pom.xml +++ b/integration-tests/sse/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/ssl/pom.xml b/integration-tests/ssl/pom.xml index eb32926..9427202 100644 --- a/integration-tests/ssl/pom.xml +++ b/integration-tests/ssl/pom.xml @@ -13,7 +13,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/integration-tests/webservices/pom.xml b/integration-tests/webservices/pom.xml index 3828e0d..f205dd8 100644 --- a/integration-tests/webservices/pom.xml +++ b/integration-tests/webservices/pom.xml @@ -21,7 +21,7 @@ integration-tests org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/meecrowave-arquillian/pom.xml b/meecrowave-arquillian/pom.xml index e23a3ad..6841de8 100644 --- a/meecrowave-arquillian/pom.xml +++ b/meecrowave-arquillian/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml index 142daa0..6567a64 100644 --- a/meecrowave-core/pom.xml +++ b/meecrowave-core/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml index d4b94c1..646f6cc 100644 --- a/meecrowave-doc/pom.xml +++ b/meecrowave-doc/pom.xml @@ -21,7 +21,7 @@ meecrowave org.apache.meecrowave -1.2.15-SNAPSHOT +1.2.15 4.0.0 diff --git a/meecrowave-gradle-plugin/pom.xml b/meecrowave-gradle-plugin/pom.xml index cdaf7db
[openwebbeans-meecrowave] branch master updated: MEECROWAVE-324 MEECROWAVE-325 MEECROWAVE-326 various version upgrades
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 26708af MEECROWAVE-324 MEECROWAVE-325 MEECROWAVE-326 various version
upgrades
26708af is described below
commit 26708afe9a2181447d1141ecddbaabd69a27ffbb
Author: Mark Struberg
AuthorDate: Thu Dec 22 08:13:54 2022 +0100
MEECROWAVE-324 MEECROWAVE-325 MEECROWAVE-326 various version upgrades
* Apache parent 29
* CXF-3.5.5
* log4j2-2.19.0
---
.../apache/meecrowave/tomcat/MeecrowaveContextConfig.java| 12 +---
pom.xml | 8
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
index 1bd5124..c0d26a4 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
@@ -22,13 +22,11 @@ import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
import static java.util.Optional.ofNullable;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Modifier;
import java.net.URL;
-import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -60,16 +58,13 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
import org.apache.webbeans.spi.ScannerService;
-import org.xml.sax.InputSource;
public class MeecrowaveContextConfig extends ContextConfig {
-private static final byte[] DEFAULT_WEB_XML = "".getBytes(StandardCharsets.UTF_8);
-
private final Configuration configuration;
private final Map>> webClasses = new
HashMap<>();
private final boolean fixDocBase;
private final ServletContainerInitializer intializer;
- private final Consumer redeployCallback;
+private final Consumer redeployCallback;
private OwbAnnotationFinder finder;
private ReloadOnChangeController watcher;
@@ -182,11 +177,6 @@ public class MeecrowaveContextConfig extends ContextConfig
{
}
}
-@Override // just to avoid an info log pretty useless for us
-protected InputSource getGlobalWebXmlSource() {
-return ofNullable(super.getGlobalWebXmlSource()).orElse(new
InputSource(new ByteArrayInputStream(DEFAULT_WEB_XML)));
-}
-
@Override
protected void processServletContainerInitializers() { // use our finder
if (!configuration.isTomcatScanning()) {
diff --git a/pom.xml b/pom.xml
index 7675e77..5ee0b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache
apache
-23
+29
org.apache.meecrowave
@@ -51,11 +51,11 @@
${project.groupId}.${project.artifactId}
4.13.2
-9.0.62
+9.0.70
2.0.27
-3.5.2
+3.5.5
1.2.19
-2.17.2
+2.19.0
1.9.5
2.2.11
3.2.0
[openwebbeans] branch master updated (30c34ba04 -> 4c3aefdaa)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git from 30c34ba04 simple test on DefaultBeanArchiveServiceTest to ensure we ignore the namespace new bc22688e2 OWB-1414 downgrade testng to run on Java8 again new 4c3aefdaa OWB-1415 use gradle m2 repo instead of bintray 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: webbeans-gradle/pom.xml | 4 ++-- webbeans-tck-jakarta/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[openwebbeans] 01/02: OWB-1414 downgrade testng to run on Java8 again
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit bc22688e2797af95d72ad882864f1c81711d415d Author: Mark Struberg AuthorDate: Tue Oct 11 09:37:01 2022 +0200 OWB-1414 downgrade testng to run on Java8 again The 7.x version of testng requires Java16. --- webbeans-tck-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webbeans-tck-jakarta/pom.xml b/webbeans-tck-jakarta/pom.xml index 7c0ccd1d4..34b0f0a2f 100644 --- a/webbeans-tck-jakarta/pom.xml +++ b/webbeans-tck-jakarta/pom.xml @@ -121,7 +121,7 @@ org.testng testng - 7.6.0 + 6.14.3 test
[openwebbeans] 02/02: OWB-1415 use gradle m2 repo instead of bintray
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit 4c3aefdaa645665c43b359ba66d9a24e39776f33 Author: Mark Struberg AuthorDate: Tue Oct 11 09:40:12 2022 +0200 OWB-1415 use gradle m2 repo instead of bintray Bintray was shut down some time ago. --- webbeans-gradle/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webbeans-gradle/pom.xml b/webbeans-gradle/pom.xml index c4cc19fdd..428480832 100644 --- a/webbeans-gradle/pom.xml +++ b/webbeans-gradle/pom.xml @@ -67,8 +67,8 @@ - jcenter - https://jcenter.bintray.com + gradle-m2 + https://plugins.gradle.org/m2/
svn commit: r55068 - /release/openwebbeans/2.0.26/
Author: struberg Date: Sun Jun 12 12:13:00 2022 New Revision: 55068 Log: delete older version of archived OWB release Removed: release/openwebbeans/2.0.26/
