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

Jump to bottom

CDI API + Weldconnector service file and refactoring #23946

Merged
merged 4 commits into from
May 23, 2022
Merged

CDI API + Weldconnector service file and refactoring #23946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
882f0d6
Refactoring
arjantijms May 23, 2022
2a93357
Update to CDI 4.0.1
arjantijms May 23, 2022
6aa4b03
Add new service file to the cdi api fragment
arjantijms May 23, 2022
7ff2e2f
Log exceptions
arjantijms May 23, 2022
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
2 changes: 1 addition & 1 deletion appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<jstl-impl.version>3.0.0</jstl-impl.version>

<!-- Jakarta CDI -->
<jakarta.cdi-api.version>4.0.0</jakarta.cdi-api.version>
<jakarta.cdi-api.version>4.0.1</jakarta.cdi-api.version>
<weld.version>5.0.0.SP1</weld.version>
<jboss.classfilewriter.version>1.2.5.Final</jboss.classfilewriter.version>

Expand Down
10 changes: 6 additions & 4 deletions ...i/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -18,16 +19,16 @@

import java.util.List;

import jakarta.enterprise.inject.spi.DefinitionException;
import jakarta.enterprise.inject.spi.DeploymentException;

import org.apache.commons.lang.exception.ExceptionUtils;
import org.jboss.arquillian.container.spi.client.container.DeploymentExceptionTransformer;

import jakarta.enterprise.inject.spi.DefinitionException;
import jakarta.enterprise.inject.spi.DeploymentException;

/**
*
* See AS7-1197 for more details.
*
*
* @see org.jboss.weld.tck.glassfish.GlassFishExtension
* @author J J Snyder (j.j.snyder@oracle.com)
*/
Expand All @@ -44,6 +45,7 @@ public class GlassFishDeploymentExceptionTransformer implements DeploymentExcept
{ "CDI definition failure:",
"org.jboss.weld.exceptions.DefinitionException" };

@Override
public Throwable transform(Throwable throwable) {

// Arquillian sometimes returns InvocationException with nested AS7
Expand Down
3 changes: 2 additions & 1 deletion appserver/web/cdi-api-fragment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -54,7 +55,7 @@
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
<Fragment-Host>jakarta.enterprise.cdi-api</Fragment-Host>
<Import-Package>org.glassfish.weld</Import-Package>
<Import-Package>org.glassfish.weld,org.jboss.weld.lite.extension.translator</Import-Package>
<Bundle-Description>${project.description}</Bundle-Description>
</manifestEntries>
</archive>
Expand Down
1 change: 1 addition & 0 deletions .../resources/META-INF/services/jakarta.enterprise.inject.build.compatible.spi.BuildServices
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.jboss.weld.lite.extension.translator.BuildServicesImpl
Loading