Consume javax.persistence-api from Maven central
Also contains some cleanup:
* Remove slf4j-nop from repository/ext,
* remove logback bundles from repository/ext and
* remove unused stuff from gradle.properties
diff --git a/build.gradle b/build.gradle
index d56f8e8..3328af8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -309,11 +309,6 @@
'XB.FINDER' : apacheXBeanFinderVersion,
'XB.NAMING' : apacheXBeanNamingVersion,
'XB.REFLECT' : apacheXBeanReflectVersion,
- 'EL.ANTLR' : eclipsePersistenceAntlrVersion,
- 'EL.ASM' : eclipsePersistenceAsmVersion,
- 'EL.CORE' : eclipsePersistenceCoreVersion,
- 'EL.JPA' : eclipsePersistenceJpaVersion,
- 'EL.JPQL' : eclipsePersistenceJpaJpqlVersion,
'FACES.API' : glassfishJavaxFacesVersion,
'FACES.IMPL' : glassfishComSunFacesVersion,
@@ -537,6 +532,7 @@
dependency "javax.el:javax.el-api:${javaxElVersion}"
dependency "javax.enterprise:cdi-api:${cdiApiVersion}"
dependency "javax.jms:javax.jms-api:${javaxJmsVersion}"
+ dependency "javax.persistence:javax.persistence-api:${javaxPersistenceVersion}"
dependency "javax.resource:javax.resource-api:${javaxResourceVersion}"
dependency "javax.security.auth.message:javax.security.auth.message-api:${javaxSecurityAuthMessageVersion}"
dependency "javax.servlet:javax.servlet-api:${javaxServletVersion}"
@@ -580,6 +576,14 @@
entry 'geronimo-connector'
}
+ dependencySet(group:'org.eclipse.persistence', version: eclipsePersistenceVersion) {
+ entry 'org.eclipse.persistence.antlr'
+ entry 'org.eclipse.persistence.asm'
+ entry 'org.eclipse.persistence.core'
+ entry 'org.eclipse.persistence.jpa'
+ entry 'org.eclipse.persistence.jpa.jpql'
+ }
+
// testing
dependency "junit:junit:${junitVersion}"
dependency "org.hamcrest:hamcrest-core:${hamcrestCoreVersion}"
diff --git a/gradle.properties b/gradle.properties
index 1e63586..7dba76d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -155,13 +155,6 @@
#CQ 13705 org.springframework.webmvc.portlet
#CQ 13706 org.springframework.websocket
springframeworkVersion = 5.1.11.RELEASE
-springAopHash = 323910d0bd37c13ff534ef62fba303a9bcef1451
-springBeansHash = bf5fd324c11eb63777f810250cb8c2ea292f9279
-springExpressionHash = 92cc7dd736b78420d7a1bcc76b4946f847b0501
-springContextHash = e84a767d680ba3d4c9dedbf787d32e570bdfc7ff
-springContextSupportHash = e4911b1a9959b5540cedfdbe037d552b6052eeef
-springCoreHash = 415c7d22dcab46985f27bbe1ce6de968e073497c
-springWebHash = 2340ad8f7dc47227a0475836791541619fff2486
geminiManagementVersion = 1.0.5.RELEASE
geminiWebVersion = 3.0.4.RELEASE
@@ -254,7 +247,7 @@
javaxMailVersion = 1.5.6
# TODO create CQ?
# Available from Eclipse Link p2 site http://download.eclipse.org/rt/eclipselink/updates/2.4.2.v20130514-5956486/
-javaxPersistenceVersion=2.1.0.v201304241213
+javaxPersistenceVersion=2.2
# CQ3940
javaxPortletVersion=2.0.0
javaxResourceVersion=1.7.1
@@ -289,12 +282,7 @@
# Note: Version 1.1.2 requires javax.servlet-api 4.+
javaxXmlRpcVersion=1.1.1
-eclipsePersistenceAntlrVersion = 3.2.0.v201206041011
-eclipsePersistenceAsmVersion = 3.3.1.v201206041142
-# TODO update to 2.4.2 required by spring-orm
-eclipsePersistenceCoreVersion = 2.4.1.v20121003-ad44345
-eclipsePersistenceJpaVersion = 2.4.1.v20121003-ad44345
-eclipsePersistenceJpaJpqlVersion = 2.0.1.v20121003-ad44345
+eclipsePersistenceVersion = 2.7.5
# CQ6092 cdi-api Version: 1.0 (Context and Dependency Injection API from JSR 299)
cdiApiVersion = 2.0.SP1
@@ -338,70 +326,7 @@
# system-tests
dumbsterVersion = 1.6.0
-# optional Spring Framework 4.2.9.RELEASE dependencies
-# only used to generate the correct OSGi manifests
-
-# spring-aop
-jamonVersion = 2.81
-commonsPool2Version = 2.4.2
-
-# spring-aspects
-javaxCacheVersion = 1.0.0
-
-# spring-beans
-groovyVersion = 2.4.5
-snakeYamlVersion = 1.16
-
-# spring-context
-# bundlor fails with 2.0b4
-beanShellVersion = 2
-jodaTimeVersion = 2.9.1
-jrubyVersion = 1.7.23
-
-# spring-context-support
-commonjVersion = 1.1.0
-ehcacheVersion = 2.10.1
-freemarkerVersion = 2.3.23
-jasperreportsVersion = 6.2.0
-velocityVersion = 1.7
-
-# spring-core
-joptSimpleVersion = 4.9
-
-# spring-jdbc
-c3p0Version = 0.9.5.2
-jacksonVersion = 2.6.4
-
-# spring-messaging
-nettyVersion = 4.0.33.Final
-reactorVersion = 2.0.7.RELEASE
-
-# spring-orm
-openjpaVersion = 2.4.0
-
-# spring-oxm
-xstreamVersion = 1.4.8
-xmlBeans = 2.6.0
-castorVersion = 1.4.0
-jibxVersion = 1.2.6
-
-# spring-web
-hessianVersion = 4.0.38
-gsonVersion = 2.5
-protobufJavaVersion = 2.6.1
-protobufJavaFormatVersion = 1.2
-romeVersion = 1.5.1
-okhttpVersion = 2.7.0
-
# CQ 13638
okhttp3Version = 3.8.0
# CQ 13639
okioVersion = 1.13.0
-
-# spring-webmvc
-jxlVersion = 2.6.12
-poiVersion = 3.13
-webjarsVersion = 0.28
-
-# spring-websocket
-undertowVersion = 1.3.10.Final
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 43f5bad..c2f2681 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -267,7 +267,7 @@
signedExternalPlugin 'org.glassfish.hk2.external:javax.inject'
signedExternalPlugin 'javax.jms:javax.jms-api'
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+ signedExternalPlugin 'javax.persistence:javax.persistence-api'
signedExternalPlugin 'javax.security.auth.message:javax.security.auth.message-api'
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.security.jacc", version: javaxSecurityJaccVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.glassfish.web", name: "javax.servlet.jsp.jstl", version: javaxServletJspJstlImplVersion
@@ -336,11 +336,11 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.websocket", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jdt.core.compiler.batch", version: eclipseJdtCoreCompilerBatchVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.antlr", version: eclipsePersistenceAntlrVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.asm", version: eclipsePersistenceAsmVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.core", version: eclipsePersistenceCoreVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.jpa", version: eclipsePersistenceJpaVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.jpa.jpql", version: eclipsePersistenceJpaJpqlVersion, configuration: "compile", ext: "jar"
+ signedExternalPlugin 'org.eclipse.persistence:org.eclipse.persistence.antlr'
+ signedExternalPlugin 'org.eclipse.persistence:org.eclipse.persistence.asm'
+ signedExternalPlugin 'org.eclipse.persistence:org.eclipse.persistence.core'
+ signedExternalPlugin 'org.eclipse.persistence:org.eclipse.persistence.jpa'
+ signedExternalPlugin 'org.eclipse.persistence:org.eclipse.persistence.jpa.jpql'
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.derby", version: apacheDerbyVersion, configuration: "compile", ext: "jar"
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
index 8a3ca07..3fa2c52 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
Binary files differ
diff --git a/packaging/build.gradle b/packaging/build.gradle
index 7d15ee0..fd26d83 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -131,7 +131,7 @@
repositoryExt 'javax.ejb:javax.ejb-api:3.2.2'
repositoryExt 'javax.el:javax.el-api'
repositoryExt group: "com.sun.mail", name: "javax.mail", version: javaxMailVersion
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+ repositoryExt 'javax.persistence:javax.persistence-api'
repositoryExt 'javax.servlet.jsp:javax.servlet.jsp-api'
repositoryExt 'javax.security.auth.message:javax.security.auth.message-api'
@@ -147,9 +147,6 @@
repositoryExt 'org.slf4j:jul-to-slf4j'
repositoryExt 'org.slf4j:jcl-over-slf4j'
repositoryExt 'org.slf4j:log4j-over-slf4j'
- repositoryExt 'org.slf4j:slf4j-nop'
- repositoryExt 'ch.qos.logback:logback-core'
- repositoryExt 'ch.qos.logback:logback-classic'
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jdt.core.compiler.batch", version: eclipseJdtCoreCompilerBatchVersion, configuration: "compile", ext: "jar"
diff --git a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
index 9f6cb05..74eb5d4 100644
--- a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
@@ -1,4 +1,6 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+
+ implementation 'javax.persistence:javax.persistence-api'
+ implementation 'org.eclipse.persistence:jakarta.persistence:2.2.3'
}
diff --git a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/bundle.bnd b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/bundle.bnd
index 8b64a51..0b47ee4 100644
--- a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/bundle.bnd
+++ b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/bundle.bnd
@@ -1,6 +1,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Web Enterprise javax.persistence Fragment
Bundle-SymbolicName: org.eclipse.virgo.web.enterprise.javax.persistence.extension
-Fragment-Host: javax.persistence
-Import-Package: !javax.persistencem,!javax.persistence.spi,!org.eclipse.persistence.javax.persistence.osgi,*
+Fragment-Host: javax.persistence-api
+Import-Package: !javax.persistence,!javax.persistence.spi,!org.eclipse.persistence.javax.persistence.osgi,*
Export-Package: org.eclipse.virgo.web.enterprise.javax.persistence.extension
diff --git a/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle b/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
index 1decea5..a4664f1 100644
--- a/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
@@ -1,6 +1,7 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+
+ implementation 'javax.persistence:javax.persistence-api'
compile project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension')
}
diff --git a/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle b/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
index 6b483d9..7fb9dbd 100644
--- a/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
@@ -1,6 +1,6 @@
dependencies {
implementation 'javax.ejb:javax.ejb-api'
- compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+ implementation 'javax.persistence:javax.persistence-api'
implementation 'javax.enterprise:cdi-api'
compile group: "org.eclipse.virgo.mirrored", name: "org.glassfish.com.sun.faces", version: glassfishComSunFacesVersion, configuration: "compile", ext: "jar"
diff --git a/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle b/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
index b6d6d6a..f4747da 100644
--- a/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
@@ -1,6 +1,6 @@
dependencies {
implementation 'javax.transaction:javax.transaction-api'
- compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.core", version: eclipsePersistenceCoreVersion, configuration: "compile", ext: "jar"
+ implementation 'org.eclipse.persistence:org.eclipse.persistence.core'
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.core", version: apacheOpenejbCoreVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.loader", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
diff --git a/web/org.eclipse.virgo.web.test/build.gradle b/web/org.eclipse.virgo.web.test/build.gradle
index 858faa8..eefb5be 100644
--- a/web/org.eclipse.virgo.web.test/build.gradle
+++ b/web/org.eclipse.virgo.web.test/build.gradle
@@ -83,7 +83,7 @@
repositoryExt 'javax.el:javax.el-api'
repositoryExt 'javax.jms:javax.jms-api'
repositoryExt group: "com.sun.mail", name: "javax.mail", version: javaxMailVersion
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+ repositoryExt 'javax.persistence:javax.persistence-api'
repositoryExt 'javax.portlet:portlet-api:3.0.1'
repositoryExt 'javax.security.auth.message:javax.security.auth.message-api'
repositoryExt 'javax.servlet:javax.servlet-api'
