This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new 8633cefd147 bumps jakarta.enterprise.cdi-api 4.0.1 -> 4.1.0
8633cefd147 is described below
commit 8633cefd147d950b45d5cb3ae41f1d79290a7615
Author: andi-huber <[email protected]>
AuthorDate: Mon Jan 13 08:31:18 2025 +0100
bumps jakarta.enterprise.cdi-api 4.0.1 -> 4.1.0
---
bom/pom.xml | 17 +--
commons/pom.xml | 5 +-
.../commons/internal/exceptions/_Exceptions.java | 1 +
core/transaction/src/main/java/module-info.java | 6 +-
.../events/TransactionCompletionStatus.java | 1 -
.../jpa/eclipselink/src/main/java/module-info.java | 12 +-
.../inject/BeanManagerForEntityListeners.java | 128 +++++++++------------
.../markdown/applib/src/main/java/module-info.java | 4 +-
8 files changed, 74 insertions(+), 100 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 95ed6ea4d71..0ccf1df79e7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -136,24 +136,17 @@ identified
<javafaker.version>1.0.2</javafaker.version>
<javassist.version>3.30.2-GA</javassist.version>
- <jaxb-impl.version>4.0.1</jaxb-impl.version>
- <jaxws-ri.version>4.0.0</jaxws-ri.version>
-
<jakartaee.version>10.0.0</jakartaee.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
- <jakarta.inject-api.version>2.0.1.MR</jakarta.inject-api.version>
- <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
+ <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
+ <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
<jbcrypt.version>0.4</jbcrypt.version>
<jboss-jaxrs-api_2.1_spec.version>2.0.2.Final</jboss-jaxrs-api_2.1_spec.version>
- <!-- v3.2 not available yet, use datanucleus staging for now -->
- <!-- <jdo-api.version>3.2</jdo-api.version> -->
-
<jdom.version>2.0.6.1</jdom.version>
<jmock.version>2.13.1</jmock.version>
<joda-time.version>2.13.0</joda-time.version>
- <jopt-simple.version>6.0-alpha-3</jopt-simple.version>
<jquery-ui.version>1.14.1</jquery-ui.version> <!--
org.webjars:jquery-ui -->
@@ -1872,12 +1865,6 @@ identified
</dependency>
-->
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>${jopt-simple.version}</version>
- </dependency>
-
<!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>ognl</groupId>
diff --git a/commons/pom.xml b/commons/pom.xml
index 802ce2ec76f..63a5d380c97 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -79,12 +79,9 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>4.0.1</version>
+ <version>4.1.0</version>
<exclusions>
<exclusion>
- <!-- outdated v5.0.0 transitively
brought in by
-
jakarta.enterprise:jakarta.enterprise.cdi-api:jar:4.0.1:compile
- -->
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
diff --git
a/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
b/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
index 2ca0c2985ad..668cd7c6607 100644
---
a/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
@@ -270,6 +270,7 @@ public final class _Exceptions {
*}</pre>
*
*/
+ @Deprecated
public static void throwNotImplemented() {
dumpStackTrace();
throw notImplemented();
diff --git a/core/transaction/src/main/java/module-info.java
b/core/transaction/src/main/java/module-info.java
index 72f882f2f04..9ae0fba135e 100644
--- a/core/transaction/src/main/java/module-info.java
+++ b/core/transaction/src/main/java/module-info.java
@@ -23,10 +23,13 @@ module org.apache.causeway.core.transaction {
exports org.apache.causeway.core.transaction.events;
exports org.apache.causeway.core.transaction.scope;
+ requires static lombok;
+
requires jakarta.annotation;
requires java.sql;
requires jakarta.inject;
- requires static lombok;
+ requires jakarta.transaction;
+
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
requires org.apache.causeway.core.config;
@@ -35,5 +38,4 @@ module org.apache.causeway.core.transaction {
requires spring.context;
requires spring.core;
requires spring.tx;
- requires jakarta.transaction;
}
diff --git
a/core/transaction/src/main/java/org/apache/causeway/core/transaction/events/TransactionCompletionStatus.java
b/core/transaction/src/main/java/org/apache/causeway/core/transaction/events/TransactionCompletionStatus.java
index 2c9cdf39f44..4e3a42734eb 100644
---
a/core/transaction/src/main/java/org/apache/causeway/core/transaction/events/TransactionCompletionStatus.java
+++
b/core/transaction/src/main/java/org/apache/causeway/core/transaction/events/TransactionCompletionStatus.java
@@ -38,7 +38,6 @@ public enum TransactionCompletionStatus {
/**
* @param status field from {@link Status}.
- * @return
*/
public static TransactionCompletionStatus forStatus(final int status) {
switch (status) {
diff --git a/persistence/jpa/eclipselink/src/main/java/module-info.java
b/persistence/jpa/eclipselink/src/main/java/module-info.java
index 38003c1107c..9a0444e8e79 100644
--- a/persistence/jpa/eclipselink/src/main/java/module-info.java
+++ b/persistence/jpa/eclipselink/src/main/java/module-info.java
@@ -21,11 +21,16 @@ module org.apache.causeway.persistence.jpa.eclipselink {
exports org.apache.causeway.persistence.jpa.eclipselink;
exports org.apache.causeway.persistence.jpa.eclipselink.config;
+ requires static lombok;
+
+ requires java.sql;
+
requires jakarta.annotation;
requires jakarta.inject;
requires jakarta.persistence;
- requires java.sql;
- requires static lombok;
+ requires jakarta.el;
+ requires jakarta.cdi;
+
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
requires org.apache.causeway.core.config;
@@ -40,6 +45,5 @@ module org.apache.causeway.persistence.jpa.eclipselink {
requires spring.jdbc;
requires spring.orm;
requires spring.tx;
- requires jakarta.cdi;
- requires jakarta.el;
+
}
\ No newline at end of file
diff --git
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
index 0a8d2c839d2..b7de730e537 100644
---
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
+++
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
@@ -20,6 +20,7 @@ package
org.apache.causeway.persistence.jpa.eclipselink.inject;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -84,152 +85,128 @@ public class BeanManagerForEntityListeners implements
BeanManager {
@Override
public Object getReference(final Bean<?> bean, final Type beanType, final
CreationalContext<?> ctx) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Object getInjectableReference(final InjectionPoint ij, final
CreationalContext<?> ctx) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Set<Bean<?>> getBeans(final Type beanType, final Annotation...
qualifiers) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Set<Bean<?>> getBeans(final String name) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Bean<?> getPassivationCapableBean(final String id) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <X> Bean<? extends X> resolve(final Set<Bean<? extends X>> beans) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public void validate(final InjectionPoint injectionPoint) {
- _Exceptions.throwNotImplemented();
+ throw _Exceptions.notImplemented();
}
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T
event, final Annotation... qualifiers) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public List<Decorator<?>> resolveDecorators(final Set<Type> types, final
Annotation... qualifiers) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public List<Interceptor<?>> resolveInterceptors(final InterceptionType
type, final Annotation... interceptorBindings) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isScope(final Class<? extends Annotation> annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isNormalScope(final Class<? extends Annotation>
annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isPassivatingScope(final Class<? extends Annotation>
annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isQualifier(final Class<? extends Annotation>
annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isInterceptorBinding(final Class<? extends Annotation>
annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean isStereotype(final Class<? extends Annotation>
annotationType) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public Set<Annotation> getInterceptorBindingDefinition(final Class<?
extends Annotation> bindingType) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Set<Annotation> getStereotypeDefinition(final Class<? extends
Annotation> stereotype) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean areQualifiersEquivalent(final Annotation qualifier1, final
Annotation qualifier2) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public boolean areInterceptorBindingsEquivalent(final Annotation
interceptorBinding1,
final Annotation interceptorBinding2) {
- _Exceptions.throwNotImplemented();
- return false;
+ throw _Exceptions.notImplemented();
}
@Override
public int getQualifierHashCode(final Annotation qualifier) {
- _Exceptions.throwNotImplemented();
- return 0;
+ throw _Exceptions.notImplemented();
}
@Override
public int getInterceptorBindingHashCode(final Annotation
interceptorBinding) {
- _Exceptions.throwNotImplemented();
- return 0;
+ throw _Exceptions.notImplemented();
}
@Override
public Context getContext(final Class<? extends Annotation> scopeType) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public ELResolver getELResolver() {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public ExpressionFactory wrapExpressionFactory(final ExpressionFactory
expressionFactory) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
@@ -239,76 +216,81 @@ public class BeanManagerForEntityListeners implements
BeanManager {
@Override
public <X> ProducerFactory<X> getProducerFactory(final AnnotatedField<?
super X> field, final Bean<X> declaringBean) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <X> ProducerFactory<X> getProducerFactory(final AnnotatedMethod<?
super X> method, final Bean<X> declaringBean) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <T> BeanAttributes<T> createBeanAttributes(final AnnotatedType<T>
type) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public BeanAttributes<?> createBeanAttributes(final AnnotatedMember<?>
type) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <T> Bean<T> createBean(final BeanAttributes<T> attributes, final
Class<T> beanClass,
final InjectionTargetFactory<T> injectionTargetFactory) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <T, X> Bean<T> createBean(final BeanAttributes<T> attributes, final
Class<X> beanClass,
final ProducerFactory<X> producerFactory) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public InjectionPoint createInjectionPoint(final AnnotatedField<?> field) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public InjectionPoint createInjectionPoint(final AnnotatedParameter<?>
parameter) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <T extends Extension> T getExtension(final Class<T> extensionClass)
{
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public <T> InterceptionFactory<T> createInterceptionFactory(final
CreationalContext<T> ctx, final Class<T> clazz) {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Event<Object> getEvent() {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
}
@Override
public Instance<Object> createInstance() {
- _Exceptions.throwNotImplemented();
- return null;
+ throw _Exceptions.notImplemented();
+ }
+
+ @Override
+ public Collection<Context> getContexts(final Class<? extends Annotation>
scopeType) {
+ throw _Exceptions.notImplemented();
+ }
+
+ @Override
+ public boolean isMatchingBean(final Set<Type> beanTypes, final
Set<Annotation> beanQualifiers, final Type requiredType,
+ final Set<Annotation> requiredQualifiers) {
+ throw _Exceptions.notImplemented();
+ }
+
+ @Override
+ public boolean isMatchingEvent(final Type specifiedType, final
Set<Annotation> specifiedQualifiers, final Type observedEventType,
+ final Set<Annotation> observedEventQualifiers) {
+ throw _Exceptions.notImplemented();
}
}
diff --git a/valuetypes/markdown/applib/src/main/java/module-info.java
b/valuetypes/markdown/applib/src/main/java/module-info.java
index 04e68648c3c..6be3f486923 100644
--- a/valuetypes/markdown/applib/src/main/java/module-info.java
+++ b/valuetypes/markdown/applib/src/main/java/module-info.java
@@ -21,6 +21,8 @@ module org.apache.causeway.valuetypes.markdown.applib {
exports org.apache.causeway.valuetypes.markdown.applib.value;
exports org.apache.causeway.valuetypes.markdown.applib.jaxb;
+ requires static lombok;
+
requires flexmark;
requires flexmark.ext.gfm.strikethrough;
requires flexmark.ext.tables;
@@ -31,7 +33,7 @@ module org.apache.causeway.valuetypes.markdown.applib {
requires flexmark.util.sequence;
requires jakarta.inject;
requires jakarta.xml.bind;
- requires static lombok;
+
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
requires spring.context;
