Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for executing CDI Lite extensions. Upgrade Weld to version 5 #114

Merged
merged 2 commits into from
Nov 30, 2021
Merged

Add support for executing CDI Lite extensions. Upgrade Weld to version 5 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71c34b4
Add support for executing CDI Lite extensions. Upgrade Weld to versio…
manovotn Nov 26, 2021
0caf78b
Remove JDK 8 from the CI matrix.
manovotn Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ jobs:
fail-fast: false
matrix:
java:
- { name: "8",
java-version: 8,
}
- {
name: "11",
java-version: 11,
Expand Down
4 changes: 4 additions & 0 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-impl</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-lite-extension-translator</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions ...boss/arquillian/container/weld/embedded/extension/BuildCompatibleExtensionTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.jboss.arquillian.container.weld.embedded.extension;

import org.jboss.weld.lite.extension.translator.LiteExtensionTranslator;

/**
* Meant to be same as {@link LiteExtensionTranslator}; this class is present only so that we can register a service
* provider that originates from this JAR
*
* @see org.jboss.weld.lite.extension.translator.LiteExtensionTranslator
*/
public class BuildCompatibleExtensionTranslator extends LiteExtensionTranslator {
}
1 change: 1 addition & 0 deletions impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.jboss.arquillian.container.weld.embedded.extension.BuildCompatibleExtensionTranslator
2 changes: 2 additions & 0 deletions impl/src/test/java/org/jboss/arquillian/container/weld/embedded/beans/LoopingProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.jboss.arquillian.container.weld.embedded.beans;

import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.inject.Produces;

/**
Expand All @@ -25,6 +26,7 @@
* @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
@Dependent
public class LoopingProducer
{
@Produces
Expand Down
3 changes: 3 additions & 0 deletions impl/src/test/java/org/jboss/arquillian/container/weld/embedded/trace/TracedBeanOne.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package org.jboss.arquillian.container.weld.embedded.trace;

import jakarta.enterprise.context.Dependent;

@Trace
@Dependent
public class TracedBeanOne {

public void call() {
Expand Down
3 changes: 3 additions & 0 deletions impl/src/test/java/org/jboss/arquillian/container/weld/embedded/trace/TracedBeanTwo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package org.jboss.arquillian.container.weld.embedded.trace;

import jakarta.enterprise.context.Dependent;

@Trace
@Dependent
public class TracedBeanTwo {

public void call() {
Expand Down
13 changes: 10 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>

<!-- TODO Circular dependency on Weld - will need to be updated after release along with CDI API version -->
<weld.api.version>4.0.SP1</weld.api.version>
<weld.core.version>4.0.2.Final</weld.core.version>
<weld.api.version>5.0.Beta2</weld.api.version>
<weld.core.version>5.0.0.Alpha1</weld.core.version>

<!-- Versioning -->
<cdi.api.version>3.0.0</cdi.api.version>
<cdi.api.version>4.0.0.Beta2</cdi.api.version>
<ejb.api.version>4.0.0</ejb.api.version>
<jta.api.version>2.0.0</jta.api.version>
<jpa.api.version>3.0.0</jpa.api.version>
Expand Down Expand Up @@ -86,6 +86,13 @@
<version>${weld.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-lite-extension-translator</artifactId>
<version>${weld.core.version}</version>
<!-- Cannot be provided, we need this dependency so that we can have META-INF entry for the CDI extension -->
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
Expand Down