Merge pull request #72 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.6.0
Bump org.apache.maven.plugins:maven-assembly-plugin from 2.4 to 3.6.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b291ae4..478bc55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@
distribution: 'temurin'
java-version: 11
- name: Cache Maven packages
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/pom.xml b/pom.xml
index a36fc8b..d0a1d04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,9 +61,9 @@
<properties>
<jakarta.atinject-api.version>2.0.1</jakarta.atinject-api.version>
<jakarta.cdi-api.version>4.0.1</jakarta.cdi-api.version>
- <jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
+ <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
- <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+ <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
@@ -302,7 +302,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
@@ -338,7 +338,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.3.0</version>
<configuration>
<archive>
<manifestEntries>
@@ -404,7 +404,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<goals>
@@ -607,7 +607,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
+ <version>0.16</version>
<configuration>
<includes>
<include>src/**/*</include>
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
index 5926288..75a0999 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
@@ -34,29 +34,31 @@
}
@Override
- public Object coerceToType(Object arg0, Class<?> arg1) throws ELException
+ public <T> T coerceToType(Object obj, Class<T> targetType) throws ELException
{
- return expressionFactory.coerceToType(arg0, arg1);
+ return expressionFactory.coerceToType(obj, targetType);
}
@Override
- public MethodExpression createMethodExpression(ELContext arg0, String arg1, Class<?> arg2, Class<?>[] arg3) throws ELException, NullPointerException
+ public MethodExpression createMethodExpression(ELContext context, String expression,
+ Class<?> expectedReturnType, Class<?>[] expectedParamTypes) throws ELException, NullPointerException
{
- return new WrappedMethodExpression(expressionFactory.createMethodExpression(arg0, arg1, arg2, arg3));
+ return new WrappedMethodExpression(
+ expressionFactory.createMethodExpression(context, expression, expectedReturnType, expectedParamTypes));
}
@Override
- public ValueExpression createValueExpression(Object arg0, Class<?> arg1)
+ public ValueExpression createValueExpression(Object instance, Class<?> expectedType)
{
- ValueExpression wrapped = expressionFactory.createValueExpression(arg0, arg1);
+ ValueExpression wrapped = expressionFactory.createValueExpression(instance, expectedType);
return new WrappedValueExpression(wrapped);
}
@Override
- public ValueExpression createValueExpression(ELContext arg0, String arg1, Class<?> arg2) throws NullPointerException, ELException
+ public ValueExpression createValueExpression(ELContext context, String expression, Class<?> expectedType) throws NullPointerException, ELException
{
- ValueExpression wrapped = expressionFactory.createValueExpression(arg0, arg1, arg2);
+ ValueExpression wrapped = expressionFactory.createValueExpression(context, expression, expectedType);
return new WrappedValueExpression(wrapped);
}
diff --git a/webbeans-gradle/pom.xml b/webbeans-gradle/pom.xml
index 848c0fa..6dd2252 100644
--- a/webbeans-gradle/pom.xml
+++ b/webbeans-gradle/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.github.jengelman.gradle.plugins</groupId>
<artifactId>shadow</artifactId>
- <version>6.0.0</version>
+ <version>6.1.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git a/webbeans-junit5/pom.xml b/webbeans-junit5/pom.xml
index 1be51a2..35ef3f1 100644
--- a/webbeans-junit5/pom.xml
+++ b/webbeans-junit5/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.4.2</version>
+ <version>5.10.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/perclass/PerMethodTest.java b/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/perclass/PerMethodTest.java
index 2cc1da8..a134491 100644
--- a/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/perclass/PerMethodTest.java
+++ b/webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/perclass/PerMethodTest.java
@@ -24,12 +24,15 @@
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.TestInstances;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.CDI;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
@@ -37,6 +40,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Function;
import java.util.stream.Stream;
import static java.util.Optional.of;
@@ -297,6 +301,11 @@
}
@Override
+ public <T> Optional<T> getConfigurationParameter(String s, Function<String, T> function) {
+ return extensionContext.getConfigurationParameter(s, function);
+ }
+
+ @Override
public void publishReportEntry(final Map<String, String> map)
{
extensionContext.publishReportEntry(map);
@@ -319,6 +328,16 @@
{
return extensionContext.getStore(namespace);
}
+
+ @Override
+ public ExecutionMode getExecutionMode() {
+ return extensionContext.getExecutionMode();
+ }
+
+ @Override
+ public ExecutableInvoker getExecutableInvoker() {
+ return extensionContext.getExecutableInvoker();
+ }
});
super.beforeEach(extensionContext);
}
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 742ace9..a3d095e 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>7.5.1</version>
+ <version>7.9.0</version>
<scope>test</scope>
</dependency>
