Repository: tomee Updated Branches: refs/heads/master 082454413 -> 1bce28805
TOMEE-1996 TOMEE-1997 openjpa 2.4.2 and owb 1.7.1 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1bce2880 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1bce2880 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1bce2880 Branch: refs/heads/master Commit: 1bce28805a9b6a4d36e7c7fafb298a9995328569 Parents: 0824544 Author: rmannibucau <[email protected]> Authored: Sat Jan 7 18:15:16 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Sat Jan 7 18:15:16 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/cdi/CdiScanner.java | 2 +- .../main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1bce2880/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java index d368bc2..68975e1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java @@ -205,7 +205,7 @@ public class CdiScanner implements ScannerService { } } } - private BeanArchiveService.BeanArchiveInformation handleBda(final StartupObject startupObject, final ClassLoader classLoader, final ClassLoaderComparator comparator, + private BeanArchiveService.BeanArchiveInformation handleBda(final StartupObject startupObject, final ClassLoader classLoader,final ClassLoaderComparator comparator, final BeansInfo beans, final ClassLoader scl, final boolean filterByClassLoader, final BeanArchiveService beanArchiveService, final boolean openejb, final BeansInfo.BDAInfo bda) { http://git-wip-us.apache.org/repos/asf/tomee/blob/1bce2880/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java index 1b92e55..1f6210b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanInfoService.java @@ -42,7 +42,7 @@ public class OpenEJBBeanInfoService implements BeanArchiveService { throw new WebBeansConfigurationException("beans.xml with version 1.1 and higher must declare a bean-discovery-mode!"); } - final DefaultBeanArchiveInformation information = new DefaultBeanArchiveInformation(); + final DefaultBeanArchiveInformation information = new DefaultBeanArchiveInformation(bda.uri.toASCIIString()); information.setVersion(info == null ? "1.1" : info.version); information.setBeanDiscoveryMode(BeanDiscoveryMode.valueOf(mode.trim().toUpperCase(Locale.ENGLISH))); information.setDecorators(bda.decorators); http://git-wip-us.apache.org/repos/asf/tomee/blob/1bce2880/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 785ebed..3ad6ea8 100644 --- a/pom.xml +++ b/pom.xml @@ -97,8 +97,8 @@ <!-- to change easily the javaee api version --> <version.javaee-api>7.0-1</version.javaee-api> - <openjpa.version>2.4.1</openjpa.version> - <org.apache.openwebbeans.version>1.7.0</org.apache.openwebbeans.version> + <openjpa.version>2.4.2</openjpa.version> + <org.apache.openwebbeans.version>1.7.1</org.apache.openwebbeans.version> <jcs.version>2.0</jcs.version> <johnzon.version>1.0.0</johnzon.version>
