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

Issue 1411: Update the EclipseLink 2.6 and 2.7 binaries #1461

Merged
merged 3 commits into from
Jan 7, 2018
Merged

Issue 1411: Update the EclipseLink 2.6 and 2.7 binaries #1461

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
347837c
Issue 1411: Update the EclipseLink 2.6 and 2.7 binaries
Jan 5, 2018
e093f71
Put back the 2.7 binaries into oss_ibm.maven file to fix DHE
Jan 5, 2018
4b4bd30
Minor change to the ossc.template to reflect the new location
Jan 5, 2018
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
24 changes: 12 additions & 12 deletions dev/cnf/oss_ibm.maven
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ com.ibm.ws.commons-io:commons-io:1.4
org.apache.geronimo.specs:geronimo-ejb_3.1_spec-alt:1.0.0
org.eclipse:yasson:1.0.0
com.ibm.ws.org.eclipse.jdt.core.compiler:ecj:4.4.2
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.asm:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.core:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.5.WAS-2733732
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.asm:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.core:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1.WAS-7bb6ff9
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.5.WAS-90e991c
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.asm:2.6.5.WAS-90e991c
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.core:2.6.5.WAS-90e991c
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.5.WAS-90e991c
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen:2.6.5.WAS-90e991c
com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.5.WAS-90e991c
org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.1-bd47e8f
org.eclipse.persistence:org.eclipse.persistence.asm:2.7.1-bd47e8f
org.eclipse.persistence:org.eclipse.persistence.core:2.7.1-bd47e8f
org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.1-bd47e8f
org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.1-bd47e8f
org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1-bd47e8f
com.ibm.ws.org.apache.myfaces.core:myfaces-api:2.3.0-20171206-214319-343
com.ibm.ws.org.apache.myfaces.core:myfaces-impl:2.3.0-20171206-214642-335
18 changes: 9 additions & 9 deletions dev/com.ibm.websphere.appserver.thirdparty.eclipselink.2.7/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Premain-Class: org.eclipse.persistence.internal.jpa.deployment.JavaSECMPInitiali
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse.org - EclipseLink Project
Bundle-ManifestVersion: 2
Specification-Version: 2.7.1.WAS
Specification-Version: 2.7.1

Export-Package: \
org.eclipse.persistence.javax.persistence.osgi;version="2.0.16", \
Expand All @@ -33,7 +33,7 @@ Export-Package: \
org.eclipse.persistence.internal.libraries.asm*;version="2.0.16", \
org.eclipse.persistence.internal.libraries.antlr.runtime*;version="2.0.16", \
org.eclipse.persistence.jpa.jpql*;version="2.0.16", \
org.eclipse.persistence.*;version="2.7.1.WAS"
org.eclipse.persistence.*;version="2.7.1"

Import-Package: \
com.ibm.tx.jta;resolution:=optional, \
Expand Down Expand Up @@ -101,12 +101,12 @@ DynamicImport-Package: \
Private-Package: com.ibm.ws.eclipselink.osgi

Include-Resource: \
@${repo;org.eclipse.persistence.antlr;3.5.2.v201605171345;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.asm;6.0.0.v201702131300;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.core;2.7.1.WAS;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa.jpql;2.7.1.WAS;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa.modelgen;2.7.1.WAS-v20170920-7bb6ff9;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa;2.7.1.WAS;EXACT}!/!META-INF/maven/*
@${repo;org.eclipse.persistence.antlr;3.5.2.v201605171345;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.asm;6.0.0.v201710052159;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.core;2.7.1.v20171221-bd47e8f;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa.jpql;2.7.1.v20171221-bd47e8f;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa.modelgen;2.7.1.v20171221-bd47e8f;EXACT}!/!META-INF/maven/*,\
@${repo;org.eclipse.persistence.jpa;2.7.1.v20171221-bd47e8f;EXACT}!/!META-INF/maven/*

publish.wlp.jar.suffix: dev/api/third-party

Expand All @@ -115,7 +115,7 @@ instrument.classesExcludes: \
org/eclipse/persistence/internal/localization/i18n/*.class

-buildpath: \
org.eclipse.persistence.jpa;version=2.7.1.WAS;strategy=exact,\
org.eclipse.persistence.jpa;version=2.7.1.v20171221-bd47e8f;strategy=exact,\
javax.persistence:javax.persistence-api;version=2.2, \
com.ibm.websphere.org.osgi.core,\
com.ibm.websphere.javaee.jsonp.1.0;version=latest,\
Expand Down
12 changes: 6 additions & 6 deletions ...elink.2.7/resources/org/eclipse/persistence/exceptions/i18n/SDOExceptionResource.nlsprops
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
# NLS_MESSAGEFORMAT_ALL
#
# Strings in this file which contain replacement variables are processed by the MessageFormat
# class (single quote must be coded as 2 consecutive single quotes ''). Strings in this file
# which do NOT contain replacement variables are NOT processed by the MessageFormat class
# (single quote must be coded as one single quote ').
# class (single quote must be coded as 2 consecutive single quotes ''). Strings in this file
# which do NOT contain replacement variables are NOT processed by the MessageFormat class
# (single quote must be coded as one single quote ').
#
# -------------------------------------------------------------------------------------------------
45000=Could not find ID element of type ID on type with uri [{0}] and name [{1}] .
Expand All @@ -51,7 +51,7 @@

45011=Could not create a DataObject for type with uri [{0}] and name [{1}] because type.isAbstract() returns true.

45012=Could not create a DataObject for interface [{0}], trying to create a DataObject for type with uri [{1}] and name [{2}]
45012=Could not create a DataObject for interface [{0}], trying to create a DataObject for type with uri [{1}] and name [{2}]

45013=Cannot look up app info for null argument.

Expand Down Expand Up @@ -141,7 +141,7 @@

45210=The DataObject being marshalled is not from the same HelperContext as the XMLHelper.

45211=Could not define type with name [{0}]. The name is not a valid XML name.
45211=The type could not be defined with the [{0}] name. The name is not a valid XML name.

45212=Could not define property with [{0}]. The name is not a valid XML name.
45212=The property could not be defined with the [{0}] name. The name is not a valid XML name.

Loading