532222 - Prepare 3rd party dependencies for Gemini Blueprint upgrade
The main focus of this commit is to provide a first version of
OSGi Bundles for Spring Framework 5.0.4
diff --git a/ebr/README.md b/ebr/README.md
index 4971e96..08608db 100644
--- a/ebr/README.md
+++ b/ebr/README.md
@@ -1,6 +1,8 @@
## Publishing 3rd party bundles
-### Building
+We publish 3rd party OSGi bundles via Jenkins job [virgo-mirrored-master](https://ci.eclipse.org/virgo/view/Virgo/job/virgo-mirrored-master/)
+
+### Building
Gradle default tasks:
1. `clean` - Cleans old build output
@@ -13,9 +15,10 @@
`./gradlew clean bundlor publishToMavenLocal test`
-### Add new Version of Spring
+### Update Spring Framework
-TBD
+The Spring Framework BOM (Bill of Material) is a good point to start
+[spring-framework-bom : 5.0.4.RELEASE](http://search.maven.org/#artifactdetails%7Corg.springframework%7Cspring-framework-bom%7C5.0.4.RELEASE%7Cpom)
### Writing PaxExam test for 3rd party bundle
diff --git a/ebr/com.squareup.okhttp3-3.8.0/build.gradle b/ebr/com.squareup.okhttp3-3.9.1/build.gradle
similarity index 100%
rename from ebr/com.squareup.okhttp3-3.8.0/build.gradle
rename to ebr/com.squareup.okhttp3-3.9.1/build.gradle
diff --git a/ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf b/ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf
similarity index 81%
rename from ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf
rename to ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf
index c539dad..339703a 100644
--- a/ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf
+++ b/ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf
@@ -2,9 +2,10 @@
Bundle-Name: OkHttp
Bundle-Vendor: Eclipse Virgo
Bundle-ManifestVersion: 2
-Bundle-Version: 3.8.0
+Bundle-Version: 3.9.1
Import-Template:
- okio;version="[1.13.0,2)",
+ okio;version="[1.14.0,2)",
+ android.os;version="0";resolution:="optional",
android.util;version="0";resolution:="optional",
javax.annotation;version="0";resolution:=optional,
javax.net.*;version="0";resolution:=optional,
diff --git a/ebr/com.squareup.okio-1.13.0/build.gradle b/ebr/com.squareup.okio-1.14.0/build.gradle
similarity index 100%
rename from ebr/com.squareup.okio-1.13.0/build.gradle
rename to ebr/com.squareup.okio-1.14.0/build.gradle
diff --git a/ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf b/ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf
similarity index 94%
rename from ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf
rename to ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf
index 96eb69a..d2b467e 100644
--- a/ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf
+++ b/ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf
@@ -2,7 +2,7 @@
Bundle-Name: Okio
Bundle-Vendor: Eclipse Virgo
Bundle-ManifestVersion: 2
-Bundle-Version: 1.13.0
+Bundle-Version: 1.14.0
Import-Template:
javax.annotation;version="0";resolution:=optional,
javax.crypto.*;version="0";resolution:=optional,
diff --git a/ebr/gradle.properties b/ebr/gradle.properties
index 8ba926d..a731781 100644
--- a/ebr/gradle.properties
+++ b/ebr/gradle.properties
@@ -26,7 +26,8 @@
# CQ 12464 SLF4J log4j-over-slf4j Version: 1.7.22
# CQ 12462 SLF4J slf4j-api Version: 1.7.22
# CQ 12540 SLF4J slf4j-nop version 1.7.22 and Later
-slf4jVersion = 1.7.22
+#slf4jVersion = 1.7.22
+slf4jVersion = 1.7.25
# CQ 12508 - Logback Classic Version 1.1.8
# CQ 12507 - Logback Core Version: 1.1.8
logbackVersion = 1.1.8
@@ -111,7 +112,7 @@
orgAopAllianceVersion = 1.0.0
geminiBlueprintVersion = 2.0.0.RELEASE
-// TODO update CQs
+// TODO update CQs for Spring 5.0.4
#CQ 13690 org.springframework.aop
#CQ 13691 org.springframework.aspects
#CQ 13692 org.springframework.beans
@@ -129,7 +130,7 @@
#CQ 13704 org.springframework.webmvc
#CQ 13705 org.springframework.webmvc.portlet
#CQ 13706 org.springframework.websocket
-springframeworkVersion = 4.3.9.RELEASE
+springframeworkVersion = 5.0.4.RELEASE
geminiManagementVersion = 1.0.5.RELEASE
geminiWebVersion = 3.0.0.RC3
@@ -159,6 +160,7 @@
commonsLangVersion = 3.1.0
# CQ pending PB CQ10162?
commonsLoggingVersion = 1.2.0
+# TODO which parts of Virgo use this version? Can we move forward to pool2?
commonsPoolVersion = 1.6.0.v201204271246
apacheTaglibsStandardVersion = 1.1.2.v20110517
@@ -168,7 +170,8 @@
apacheDerbyVersion = 10.8.2.2_v201211210650
# CQ4833 log4j Version: 1.2.15 (Subset - see all comments) (PB Orbit CQ3560)
# TODO move forward to 1.2.17 used in spring-core
-apacheLog4jVersion = 1.2.15.v201012070815
+#apacheLog4jVersion = 1.2.15.v201012070815
+apacheLog4jVersion = 2.10.0
# CQ7162 OpenEJB (Subset) Version: 4.5.2
apacheOpenejbVersion = 4.5.2
apacheOpenejbCoreVersion = 4.5.2.virgo-3
@@ -197,14 +200,24 @@
geronimoSpecsOsgiRegistryVersion = 1.1.0.v201205170710
javaxActivationVersion = 1.1.0.v201108011116
-javaxAnnotationVersion= 1.2.0.v201401042248
+# TODO upgrade to 1.3.1 due to spring-context-indexer requirement
+# javaxAnnotationVersion= 1.2.0.v201401042248
+javaxAnnotationVersion= 1.3.1
# CQ6093 ejb-api Version: 3.1.1
-javaxEjbVersion=3.1.1.v201204261316
-javaxElVersion=3.0.0.20150414
+# TODO upgrade to 3.2 due to spring-context requirement
+# javaxEjbVersion=3.1.1.v201204261316
+javaxEjbVersion=3.2
+
+# TODO add new requirement due to spring-context
+# javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0
+
+#javaxElVersion=3.0.0.20150414
+javaxElVersion=3.0.1-b04
+
# CQ6090 (PB Orbit CQ3578)
javaxInjectVersion = 1.0.0.v20091030
javaxJmsVersion=1.1.0.v201205091237
-javaxMailVersion = 1.5.5
+javaxMailVersion = 1.6.1
# 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
@@ -223,7 +236,9 @@
# CQ12543 JSP Standard Tag Library Version 1.2.5-b03
javaxServletJspJstlImplVersion=1.2.5.b03
# CQ12565 Java Interceptor API 1.2
+# TODO update from 1.2 to 1.2.1 due to spring-context requirement
javaxInterceptorVersion = 1.2
+
# CQ12546 Java Transaction API Version: 1.2 (PB Orbit CQ7296)
javaxTransactionVersion = 1.2
# CQ6095 Bean Validation API Version: 1.0.0 GA (PB CQ3570)
@@ -252,16 +267,20 @@
# CQ11207
jolokiaVersion = 1.3.3
-aspectjVersion = 1.8.10
+# TODO update from 1.8.10 - 1.8.13
+aspectjVersion = 1.8.13
# Delivered with RAP 2.3.2
jettyVersion = 8.1.16.v20140903
# TODO move forward to latest release (as of April 8th 2016)
#jettyVersion = 8.1.18.v20150929
+# TODO move forward (as required by Spring 5.0.4.RELEASE)
+#jettyVersion = 9.4.8.v20171121
# CQ9080 Apache Tomcat Version: 7.0.56 (PB Orbit CQ8933)
#apacheCatalinaVersion = 7.0.56.v201412180755
-apacheCatalinaVersion = 8.5.5
+#apacheCatalinaVersion = 8.5.5
+apacheCatalinaVersion = 8.5.28
# CQ7699 (PB Orbit CQ6772)
mozillaJavascriptVersion = 1.7.4.v201209142200
@@ -293,21 +312,32 @@
dumbsterVersion = 1.6.0
# OSGi test
-# optional spring 4.2.9.RELEASE dependencies - used only to generate the correct OSGi manifests
+
+# Optional Spring Framework 5.0.4.RELEASE dependencies - used only to generate the correct OSGi manifests
# spring-aop
+# https://github.com/spring-projects/spring-framework/blob/v5.0.4.RELEASE/spring-aop/spring-aop.gradle
jamonVersion = 2.81
-commonsPool2Version = 2.4.2
+commonsPool2Version = 2.5.0
# spring-aspects
-javaxCacheVersion = 1.0.0
+# https://github.com/spring-projects/spring-framework/blob/v5.0.4.RELEASE/spring-aspects/spring-aspects.gradle
+javaxCacheVersion = 1.1.0
# spring-beans
-groovyVersion = 2.4.5
-snakeYamlVersion = 1.16
+# https://github.com/spring-projects/spring-framework/blob/v5.0.4.RELEASE/spring-beans/spring-beans.gradle
+groovyVersion = 2.4.13
+snakeYamlVersion = 1.19
+kotlinVersion = 1.2.21
+orgJetbrainsAnnotations = 13.0
+
+# spring-context-indexer
+# https://github.com/spring-projects/spring-framework/blob/v5.0.4.RELEASE/spring-context-indexer/spring-context-indexer.gradle
+testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
# spring-context
-# bundlor fails with 2.0b4
+#
+# TODO bundlor fails with 2.0b4 - open ticket?
beanShellVersion = 2
jodaTimeVersion = 2.9.1
jrubyVersion = 1.7.23
@@ -321,7 +351,16 @@
benmanesCaffeineVersion = 2.3.5
# spring-core
-joptSimpleVersion = 4.9
+#joptSimpleVersion = 4.9
+joptSimpleVersion = 5.0.4
+#nettyVersion = 4.0.33.Final
+nettyVersion = 4.1.21.Final
+#reactorVersion = 2.0.7.RELEASE
+reactorCoreVersion = 3.1.5.RELEASE
+reactiveStreamsVersion = 1.0.2
+rxJava2Version = 2.1.9
+rxJavaVersion = 1.3.6
+rxJavaReactiveStreamsVersion = 1.2.1
# spring-jdbc
c3p0Version = 0.9.5.2
@@ -329,8 +368,6 @@
jacksonVersion = 2.6.4
# spring-messaging
-nettyVersion = 4.0.33.Final
-reactorVersion = 2.0.7.RELEASE
# spring-orm
openjpaVersion = 2.4.0
@@ -347,9 +384,9 @@
protobufJavaVersion = 2.6.1
protobufJavaFormatVersion = 1.2
romeVersion = 1.5.1
-okhttpVersion = 2.7.0
-okhttp3Version = 3.8.0
-okioVersion = 1.13.0
+okhttp3Version = 3.9.1
+okioVersion = 1.14.0
+undertowVersion = 1.3.10.Final
# spring-webmvc
jxlVersion = 2.6.12
@@ -357,4 +394,3 @@
webjarsVersion = 0.28
# spring-websocket
-undertowVersion = 1.3.10.Final
diff --git a/ebr/org.aspectj.weaver-1.8.10/build.gradle b/ebr/org.aspectj.weaver-1.8.13/build.gradle
similarity index 100%
rename from ebr/org.aspectj.weaver-1.8.10/build.gradle
rename to ebr/org.aspectj.weaver-1.8.13/build.gradle
diff --git a/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf b/ebr/org.aspectj.weaver-1.8.13/org.aspectj.weaver.mf
similarity index 100%
rename from ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf
rename to ebr/org.aspectj.weaver-1.8.13/org.aspectj.weaver.mf
diff --git a/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf
deleted file mode 100644
index 726727a..0000000
--- a/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf
+++ /dev/null
@@ -1,26 +0,0 @@
-Bundle-SymbolicName: org.springframework.aop
-Bundle-Name: Spring AOP
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- com.jamonapi.*;version="${jamonVersion:[=.=.=, +1)}";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.commons.pool.*;version="${commonsPoolVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.pool2.*;version="${commonsPool2Version:[=.=.=, +1)}";resolution:=optional,
- org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.aop.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index d6f2c81..0000000
--- a/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-configurations {
- origin
-}
-
-dependencies {
- origin group: 'org.springframework', name: 'spring-aop', version: "${springframeworkVersion}"
- sourceBundle fileTree("$buildDir/libs")
-}
-
-task removeAopallianceFromJar(type: Jar) {
- baseName = 'spring-aop'
- from zipTree(configurations.origin[0])
- exclude 'org/aopalliance/**'
-}
-
-bundlor.dependsOn removeAopallianceFromJar
diff --git a/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aop-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.aop-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-5.0.4.RELEASE/org.springframework.aop.mf
similarity index 93%
rename from ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf
rename to ebr/org.springframework.aop-5.0.4.RELEASE/org.springframework.aop.mf
index d05ddc6..7a86f90 100644
--- a/ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf
+++ b/ebr/org.springframework.aop-5.0.4.RELEASE/org.springframework.aop.mf
@@ -4,24 +4,24 @@
Bundle-ManifestVersion: 2
Bundle-Version: ${springframeworkVersion}
Import-Template:
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ com.jamonapi.*;version="${jamonVersion:[=.=.=, +1)}";resolution:=optional,
org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.commons.pool2.*;version="${commonsPool2Version:[=.=.=, +1)}";resolution:=optional,
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- com.jamonapi.*;version="${jamonVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.pool.*;version="${commonsPoolVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.pool2.*;version="${commonsPool2Version:[=.=.=, +1)}";resolution:=optional,
- org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.w3c.dom.*;version="0";resolution:=optional
Export-Template:
org.springframework.aop.*;version="${springframeworkVersion}"
+Excluded-Exports:
+ org.aopalliance.*
Ignored-Existing-Headers:
Bnd-LastModified,
- Export-Package,
Import-Package,
+ Export-Package,
Tool
-
diff --git a/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf
deleted file mode 100644
index 7cefed2..0000000
--- a/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-Bundle-SymbolicName: org.springframework.aspects
-Bundle-Name: Spring Aspects
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.cache;version="${javaxCacheVersion:[=.=.=, +1)}";resolution:=optional,
- javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.orm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional
-Export-Template:
- org.springframework.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Tool
-Excluded-Imports:
- org.springframework.context.*
diff --git a/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 5520b71..0000000
--- a/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-aspects', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aspects-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.aspects-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.aspects-4.3.9.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-5.0.4.RELEASE/org.springframework.aspects.mf
similarity index 100%
rename from ebr/org.springframework.aspects-4.3.9.RELEASE/org.springframework.aspects.mf
rename to ebr/org.springframework.aspects-5.0.4.RELEASE/org.springframework.aspects.mf
diff --git a/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index cd78444..0000000
--- a/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-beans', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf
deleted file mode 100644
index 8e5882b..0000000
--- a/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf
+++ /dev/null
@@ -1,26 +0,0 @@
-Bundle-SymbolicName: org.springframework.beans
-Bundle-Name: Spring Beans
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- javax.el.*;version="[2.2.5, 4)";resolution:=optional,
- javax.inject.*;version="[1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- org.yaml.snakeyaml.*;version="${snakeYamlVersion:[=.=.=, +1)}";resolution:="optional",
- org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.beans.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.beans-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.beans-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-5.0.4.RELEASE/org.springframework.beans.mf
similarity index 80%
rename from ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf
rename to ebr/org.springframework.beans-5.0.4.RELEASE/org.springframework.beans.mf
index 4005ddd..d2517fe 100644
--- a/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf
+++ b/ebr/org.springframework.beans-5.0.4.RELEASE/org.springframework.beans.mf
@@ -4,19 +4,21 @@
Bundle-ManifestVersion: 2
Bundle-Version: ${springframeworkVersion}
Import-Template:
- javax.el.*;version="[2.2.5, 4)";resolution:=optional,
- javax.inject.*;version="[1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- org.yaml.snakeyaml.*;version="${snakeYamlVersion:[=.=.=, +1)}";resolution:="optional",
- org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ javax.el.*;version="[3.0.1, 4)";resolution:=optional,
+ javax.inject.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.yaml.snakeyaml.*;version="${snakeYamlVersion:[=.=.=, +1)}";resolution:="optional",
+ org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
+ org.w3c.dom.*;version="0";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
Export-Template:
org.springframework.beans.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 652c1a5..0000000
--- a/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-context', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf
deleted file mode 100644
index 9c5159c..0000000
--- a/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf
+++ /dev/null
@@ -1,58 +0,0 @@
-Bundle-SymbolicName: org.springframework.context
-Bundle-Name: Spring Context
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Package:
- org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.orm.jpa.support;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- javax.inject;version="[1, 2)";resolution:=optional,
- javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- com.ibm.websphere.management;version="0";resolution:=optional
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- bsh.*;version="${beanShellVersion:[=.=.=, +1)}";resolution:=optional,
- com.sun.net.*;version="0";resolution:=optional,
- edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- javax.annotation.*;version="0";resolution:=optional,
- javax.ejb.*;version="[3, 4)";resolution:=optional,
- javax.enterprise.concurrent;version="[1, 2)";resolution:=optional,
- javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.management.*;version="0";resolution:=optional,
- javax.money.*;version="[1, 2)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- javax.rmi.*;version="0";resolution:=optional,
- javax.script;version="0";resotion:=optional,
- javax.validation.*;version="[1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- net.sf.ehcache.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.cache.*;version="[0.5.0, 0.5.0]";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
- org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- org.hibernate.validator.*;version="${hibernateVersion:[=.=.=, +1)}";resolution:=optional,
- org.joda.*;version="${jodaTimeVersion:[=.=.=, +1)}";resolution:=optional,
- org.jruby.*;version="${jrubyVersion:[=.=.=, +1)}";resolution:=optional,
- org.omg.CORBA.*;version="0";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.instrument.*;version="0";resolution:=optional,
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.context-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.context-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.context-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-5.0.4.RELEASE/org.springframework.context.mf
similarity index 93%
rename from ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf
rename to ebr/org.springframework.context-5.0.4.RELEASE/org.springframework.context.mf
index 09182f1..0bc6b8a 100644
--- a/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf
+++ b/ebr/org.springframework.context-5.0.4.RELEASE/org.springframework.context.mf
@@ -10,6 +10,7 @@
javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
com.ibm.websphere.management;version="0";resolution:=optional
Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
bsh.*;version="${beanShellVersion:[=.=.=, +1)}";resolution:=optional,
com.sun.net.*;version="0";resolution:=optional,
edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
@@ -29,7 +30,6 @@
javax.xml.*;version="0";resolution:=optional,
net.sf.ehcache.*;version="[1.0.0, 3.0.0)";resolution:=optional,
javax.cache.*;version="[0.5.0, 0.5.0]";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
@@ -48,7 +48,9 @@
org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
+ org.w3c.dom.*;version="0";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
Export-Template:
org.springframework.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf
deleted file mode 100644
index d54c5fa..0000000
--- a/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf
+++ /dev/null
@@ -1,40 +0,0 @@
-Bundle-SymbolicName: org.springframework.context.support
-Bundle-Name: Spring Context Support
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- com.google.common.*;version="[19, 100)";resolution:=optional,
- commonj.*;version="${commonjVersion:[=.=.=, +1)}";resolution:=optional,
- freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.cache.*;version="[1, 2)";resolution:=optional,
- javax.mail.*;version="[1.5, 2)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- net.sf.ehcache.*;version="${ehcacheVersion:[=.=.=, +1)}";resolution:=optional,
- net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.apache.commons.collections.*;version="${commonsCollectionsVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
- org.quartz.*;version="[2.2.2, 3)";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.context.support.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index a6af036..0000000
--- a/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-context-support', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context.support-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.context.support-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.context.support-4.3.9.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-5.0.4.RELEASE/org.springframework.context.support.mf
similarity index 100%
rename from ebr/org.springframework.context.support-4.3.9.RELEASE/org.springframework.context.support.mf
rename to ebr/org.springframework.context.support-5.0.4.RELEASE/org.springframework.context.support.mf
diff --git a/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf
deleted file mode 100644
index d43b39a..0000000
--- a/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf
+++ /dev/null
@@ -1,28 +0,0 @@
-Bundle-SymbolicName: org.springframework.core
-Bundle-Name: Spring Core
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.net;version="0",
- javax.xml.*;version="0",
- joptsimple.*;version="${joptSimpleVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.tools.ant.*;version="0";resolution:=optional,
- org.apache.commons.codec.*;version="${commonsCodecVersion:[=.=.=, +1)}",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
- org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.asm.*;version="${springframeworkVersion}",
- org.springframework.cglib.*;version="${springframeworkVersion}",
- org.springframework.core.*;version="${springframeworkVersion}",
- org.springframework.lang.*;version="${springframeworkVersion}",
- org.springframework.objenesis.*;version="${springframeworkVersion}",
- org.springframework.util.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index fc6f651..0000000
--- a/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-core', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.core-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.core-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.core-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.core-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-5.0.4.RELEASE/org.springframework.core.mf
similarity index 60%
rename from ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf
rename to ebr/org.springframework.core-5.0.4.RELEASE/org.springframework.core.mf
index 4cf2d4d..ad57b62 100644
--- a/ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf
+++ b/ebr/org.springframework.core-5.0.4.RELEASE/org.springframework.core.mf
@@ -12,8 +12,18 @@
org.apache.commons.codec.*;version="${commonsCodecVersion:[=.=.=, +1)}";resolution:=optional,
org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.annotation;version="0";resolution:=optional,
+ javax.annotation.meta;version="0";resolution:=optional,
org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
+ org.w3c.dom.*;version="0";resolution:=optional,
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.core.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.adapter.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional,
+ io.reactivex.*;version="${rxJava2Version:[=.=.=, +1)}";resolution:=optional,
+ rx.*;version="${rxJavaVersion:[=.=.=, +1)}";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
Export-Template:
org.springframework.asm.*;version="${springframeworkVersion}",
org.springframework.cglib.*;version="${springframeworkVersion}",
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/src/test/resources/bundle.conf b/ebr/org.springframework.core-5.0.4.RELEASE/src/test/resources/bundle.conf
similarity index 100%
rename from ebr/org.springframework.core-4.3.9.RELEASE/src/test/resources/bundle.conf
rename to ebr/org.springframework.core-5.0.4.RELEASE/src/test/resources/bundle.conf
diff --git a/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index cd029da..0000000
--- a/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-expression', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf
deleted file mode 100644
index 8363aac..0000000
--- a/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-SymbolicName: org.springframework.expression
-Bundle-Name: Spring Expression Language
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
-Export-Template:
- org.springframework.expression.*;version="${springframeworkVersion}"
diff --git a/ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.expression-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.expression-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-5.0.4.RELEASE/org.springframework.expression.mf
similarity index 87%
rename from ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf
rename to ebr/org.springframework.expression-5.0.4.RELEASE/org.springframework.expression.mf
index 8363aac..1bd694d 100644
--- a/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf
+++ b/ebr/org.springframework.expression-5.0.4.RELEASE/org.springframework.expression.mf
@@ -7,6 +7,7 @@
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
Export-Template:
org.springframework.expression.*;version="${springframeworkVersion}"
diff --git a/ebr/org.springframework.jcl-5.0.4.RELEASE/build.gradle b/ebr/org.springframework.jcl-5.0.4.RELEASE/build.gradle
new file mode 100644
index 0000000..e27f172
--- /dev/null
+++ b/ebr/org.springframework.jcl-5.0.4.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+ sourceBundle group: 'org.springframework', name: 'spring-jcl', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.jcl-5.0.4.RELEASE/org.springframework.jcl.mf b/ebr/org.springframework.jcl-5.0.4.RELEASE/org.springframework.jcl.mf
new file mode 100644
index 0000000..83c3bb1
--- /dev/null
+++ b/ebr/org.springframework.jcl-5.0.4.RELEASE/org.springframework.jcl.mf
@@ -0,0 +1,16 @@
+Bundle-SymbolicName: org.springframework.jcl
+Bundle-Name: Spring JCL
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.apache.logging.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}";resolution:=optional
+Export-Template:
+ org.springframework.jcl.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index f4e86ff..0000000
--- a/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-jdbc', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf
deleted file mode 100644
index 9c5be59..0000000
--- a/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf
+++ /dev/null
@@ -1,39 +0,0 @@
-Bundle-SymbolicName: org.springframework.jdbc
-Bundle-Name: Spring JDBC
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Package:
- com.ibm.websphere.rsadapter;version="0";resolution:=optional,
- com.ibm.ws.rsadapter.jdbc;version="0";resolution:=optional,
- oracle.jdbc;version="0";resolution:=optional,
- oracle.sql;version="0";resolution:=optional,
- org.jboss.resource.adapter.jdbc;version="0";resolution:=optional,
- weblogic.jdbc.extensions;version="0";resolution:=optional
-Import-Template:
- com.mchange.v2.c3p0.*;version="${c3p0Version:[=.=.=, +1)}";resolution:=optional,
- com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.sql.*;version="0",
- javax.transaction.*;version="${javaxTransactionVersion:[=.=.=, +1)}";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- org.h2.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.hsqldb.*;version="${hsqldbVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.derby.*;version="${apacheDerbyVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.jdbc.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.jdbc-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.jdbc-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.jdbc-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.jdbc-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-5.0.4.RELEASE/org.springframework.jdbc.mf
similarity index 90%
rename from ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf
rename to ebr/org.springframework.jdbc-5.0.4.RELEASE/org.springframework.jdbc.mf
index 9c5be59..8793884 100644
--- a/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf
+++ b/ebr/org.springframework.jdbc-5.0.4.RELEASE/org.springframework.jdbc.mf
@@ -29,7 +29,9 @@
org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
+ org.w3c.dom.*;version="0";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
Export-Template:
org.springframework.jdbc.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf
deleted file mode 100644
index 2d14fdd..0000000
--- a/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf
+++ /dev/null
@@ -1,35 +0,0 @@
-Bundle-SymbolicName: org.springframework.jms
-Bundle-Name: Spring JMS
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.jms.*;version="[1.1, 2)",
- javax.naming.*;version="0";resolution:=optional,
- javax.resource.*;version="[1.5, 2)";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.codehaus.jackson.*;version="[1.4.2, 2.0.0)";resolution:=optional,
- com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jca.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.jms.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 2e8586f..0000000
--- a/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-jms', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.jms-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.jms-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-5.0.4.RELEASE/org.springframework.jms.mf
similarity index 94%
rename from ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf
rename to ebr/org.springframework.jms-5.0.4.RELEASE/org.springframework.jms.mf
index c54ee07..519c804 100644
--- a/ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf
+++ b/ebr/org.springframework.jms-5.0.4.RELEASE/org.springframework.jms.mf
@@ -19,6 +19,7 @@
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.jca.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
diff --git a/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index fc5a4cf..0000000
--- a/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-messaging', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf
deleted file mode 100644
index cd299e0..0000000
--- a/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf
+++ /dev/null
@@ -1,30 +0,0 @@
-Bundle-SymbolicName: org.springframework.messaging
-Bundle-Name: Spring Messaging
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
- io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
- javax.xml.transform.*;version="0",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.reactivestreams;version="[1, 2)";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- reactor.*;version="${reactorVersion:[=.=.=, +1)}";resolution:=optional
-Export-Template:
- org.springframework.messaging.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.messaging-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.messaging-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-5.0.4.RELEASE/org.springframework.messaging.mf
similarity index 90%
rename from ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf
rename to ebr/org.springframework.messaging-5.0.4.RELEASE/org.springframework.messaging.mf
index cd299e0..1f39b38 100644
--- a/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf
+++ b/ebr/org.springframework.messaging-5.0.4.RELEASE/org.springframework.messaging.mf
@@ -8,7 +8,7 @@
io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
javax.xml.transform.*;version="0",
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.reactivestreams;version="[1, 2)";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional,
org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
@@ -20,7 +20,7 @@
org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- reactor.*;version="${reactorVersion:[=.=.=, +1)}";resolution:=optional
+ reactor.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional
Export-Template:
org.springframework.messaging.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index f790231..0000000
--- a/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-orm', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf
deleted file mode 100644
index 46033d2..0000000
--- a/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf
+++ /dev/null
@@ -1,50 +0,0 @@
-Bundle-SymbolicName: org.springframework.orm
-Bundle-Name: Spring ORM
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Package:
- com.ibatis.sqlmap.engine.transaction.external;version="[2.3.4, 3)";resolution:=optional,
- oracle.toplink.essentials.expressions;version="[2, 3)";resolution:=optional,
- javax.persistence.criteria;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- javax.persistence.metamodel;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- org.eclipse.persistence.expressions;version="[1, 3)";resolution:=optional
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- com.ibatis.*;version="[2.3.4, 3)";resolution:=optional,
- javax.jdo.*;version="[3.1, 4)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- javax.servlet.*;version="[3.0.1, 4)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- oracle.toplink.essentials.*;version="[2, 3)";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.openjpa.persistence.*;version="${openjpaVersion:[=.=.=, +1)}";resolution:=optional,
- org.eclipse.persistence.core.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
- org.eclipse.persistence.jpa.*;version="${eclipsePersistenceJpaVersion:[=.=.=, +1)}";resolution:=optional,
- org.eclipse.persistence.sessions.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
- org.hibernate.*;version="[3.6.10.Final, 6)";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.instrument.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.orm.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- DynamicImport-Package,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.orm-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.orm-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-5.0.4.RELEASE/org.springframework.orm.mf
similarity index 96%
rename from ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf
rename to ebr/org.springframework.orm-5.0.4.RELEASE/org.springframework.orm.mf
index 2ba2d03..55faf34 100644
--- a/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf
+++ b/ebr/org.springframework.orm-5.0.4.RELEASE/org.springframework.orm.mf
@@ -10,6 +10,7 @@
javax.persistence.metamodel;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
org.eclipse.persistence.expressions;version="[1, 3)";resolution:=optional
Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
com.ibatis.*;version="[2.3.4, 3)";resolution:=optional,
javax.jdo.*;version="[3.1, 4)";resolution:=optional,
javax.naming.*;version="0";resolution:=optional,
@@ -19,7 +20,6 @@
javax.transaction.*;version="[1.0.1, 2)";resolution:=optional,
javax.xml.*;version="0";resolution:=optional,
oracle.toplink.essentials.*;version="[2, 3)";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.apache.openjpa.persistence.*;version="${openjpaVersion:[=.=.=, +1)}";resolution:=optional,
org.eclipse.persistence.core.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
@@ -34,6 +34,7 @@
org.springframework.instrument.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
diff --git a/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 8e714fc..0000000
--- a/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-oxm', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf
deleted file mode 100644
index a442e30..0000000
--- a/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf
+++ /dev/null
@@ -1,28 +0,0 @@
-Bundle-SymbolicName: org.springframework.oxm
-Bundle-Name: Spring Object/XML Mapping
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.activation.*;version="0";resolution:=optional,
- javax.xml.*;version="0",
- javax.xml.bind.*;version="0";resolution:=optional,
- com.thoughtworks.xstream.*;version="${xstreamVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.xmlbeans.*;version="${xmlBeans:[=.=.=, +1)}";resolution:=optional,
- org.exolab.castor.*;version="${castorVersion:[=.=.=, +1)}";resolution:=optional,
- org.jibx.runtime.*;version="${jibxVersion:[=.=.=, +1)}";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0",
- org.xml.sax.*;version="0"
-Export-Template:
- org.springframework.oxm.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- DynamicImport-Package,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.oxm-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.oxm-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-5.0.4.RELEASE/org.springframework.oxm.mf
similarity index 93%
rename from ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf
rename to ebr/org.springframework.oxm-5.0.4.RELEASE/org.springframework.oxm.mf
index a442e30..36b2f00 100644
--- a/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf
+++ b/ebr/org.springframework.oxm-5.0.4.RELEASE/org.springframework.oxm.mf
@@ -15,6 +15,7 @@
org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.w3c.dom.*;version="0",
org.xml.sax.*;version="0"
diff --git a/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf
deleted file mode 100644
index 1347c46..0000000
--- a/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf
+++ /dev/null
@@ -1,31 +0,0 @@
-Bundle-SymbolicName: org.springframework.test
-Bundle-Name: Spring Test
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Import-Template:
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
- javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.servlet;version="[2.5.0, 4.0.0)";resolution:=optional,
- javax.servlet.http;version="[2.5.0, 4.0.0)";resolution:=optional,
- javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- junit.framework.*;version="[4.11.0, 5.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.aspectj.weaver.*;version="[1.7.1, 2.0.0)";resolution:=optional,
- org.junit.*;version="[4.11.0, 5.0.0)";resolution:=optional,
- org.springframework.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.testng.*;version="[6.5.2, 7.0.0)";resolution:=optional,
- org.hamcrest.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- com.jayway.jsonpath.*;version="[0.8.1, 1.0.0)";resolution:=optional,
- org.custommonkey.xmlunit.*;version="[1.2.0, 2.0.0)";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index b8eb387..0000000
--- a/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,64 +0,0 @@
-import java.util.jar.JarEntry
-import java.util.jar.JarOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import java.util.zip.ZipOutputStream
-
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-test', version: "${springframeworkVersion}"
-}
-
-task rewriteJar(dependsOn: 'bundlor') {
- String jarFileName = file(buildDir.path + "/org.springframework.test-${springframeworkVersion}.jar").path
- doLast() {
- ZipFile jarFile = new ZipFile(jarFileName)
- println "------------"
- println "Cloning content of jar file ${jarFileName}:"
- println "------------"
- new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
- println "------------"
- String cloneFileName = new File(jarFileName).path + "-clone"
- FileOutputStream fos = new FileOutputStream(cloneFileName)
-
- String manifest
- jarFile.entries().findAll { it.name == "META-INF/MANIFEST.MF" }.each {
- manifest = jarFile.getInputStream(it).text
- }
- println "------------"
- println manifest
- println "------------"
-
- JarOutputStream jarOutputStream = new JarOutputStream(fos,
- new java.util.jar.Manifest(new ByteArrayInputStream(manifest.getBytes(java.nio.charset.Charset.forName("UTF-8")))))
-
- println "------------"
- byte[] readBuffer = new byte[2156]
- jarFile.entries().findAll { !it.directory && !(it.name == "META-INF/MANIFEST.MF") && !(it.name.contains("TransactionalTestExecutionListener")) }.each {
- println "adding ${it.name} to ${cloneFileName}"
- jarOutputStream.putNextEntry(new JarEntry(it.name))
- jarOutputStream << jarFile.getInputStream(it)
- }
- jarOutputStream.finish()
- println "finished writing ${cloneFileName}"
- println "------------"
-
- println "from ${cloneFileName} to ${jarFileName}"
- println "within ${file(cloneFileName).parentFile.path} is ${file(cloneFileName).name}"
- println "rename ${file(cloneFileName).name} -> ${file(jarFileName).name}"
-
- delete file(jarFileName)
- copy {
- from file(file(cloneFileName).parentFile.path)
- into file(file(cloneFileName).parentFile.path)
- rename { String fileName ->
- fileName.replace(file(cloneFileName).name, file(jarFileName).name)
- }
- }
- delete file(cloneFileName)
- println "------------"
- println "Removed 'TransactionalTestExecutionListener' from content of jar file ${jarFileName}:"
- println "------------"
- new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
- println "------------"
- }
-}
diff --git a/ebr/org.springframework.test-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.test-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.test-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.test-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-5.0.4.RELEASE/org.springframework.test.mf
similarity index 83%
rename from ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf
rename to ebr/org.springframework.test-5.0.4.RELEASE/org.springframework.test.mf
index 69ded2a..fde642a 100644
--- a/ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf
+++ b/ebr/org.springframework.test-5.0.4.RELEASE/org.springframework.test.mf
@@ -32,7 +32,12 @@
org.apache.http.*;version="0";resolution:=optional,
org.openqa.selenium.*;version="0";resolution:=optional,
org.skyscreamer.jsonassert;version="0";resolution:=optional,
- org.xml.sax;version="0";resolution:=optional
+ org.xml.sax;version="0";resolution:=optional,
+ reactor.core.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional",
+ org.xmlunit.*;version="0";resolution:="optional"
Export-Template:
org.springframework.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 8e17c12..0000000
--- a/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-tx', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf
deleted file mode 100644
index ab20435..0000000
--- a/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf
+++ /dev/null
@@ -1,37 +0,0 @@
-Bundle-SymbolicName: org.springframework.transaction
-Bundle-Name: Spring Transaction
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Package:
- com.ibm.websphere.uow;version="[6.0.2.17, 7)";resolution:=optional,
- com.ibm.wsspi.uow;version="[6.0.2.17, 7)";resolution:=optional,
- oracle.j2ee.transaction;version="0";resolution:=optional,
- org.jboss.resource.work;version="0";resolution:=optional,
- weblogic.transaction;version="0";resolution:=optional
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- javax.ejb.*;version="[3, 4)";resolution:=optional,
- javax.management.*;version="0";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.resource.*;version="[1.5, 2)";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.dao.*;version="${springframeworkVersion}",
- org.springframework.jca.*;version="${springframeworkVersion}",
- org.springframework.transaction.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.transaction-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.transaction-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.transaction-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.transaction-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-5.0.4.RELEASE/org.springframework.transaction.mf
similarity index 94%
rename from ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf
rename to ebr/org.springframework.transaction-5.0.4.RELEASE/org.springframework.transaction.mf
index 4f96228..5367f3f 100644
--- a/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf
+++ b/ebr/org.springframework.transaction-5.0.4.RELEASE/org.springframework.transaction.mf
@@ -10,18 +10,19 @@
org.jboss.resource.work;version="0";resolution:=optional,
weblogic.transaction;version="0";resolution:=optional
Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
javax.ejb.*;version="[3, 4)";resolution:=optional,
javax.management.*;version="0";resolution:=optional,
javax.naming.*;version="0";resolution:=optional,
javax.resource.*;version="[1.5, 2)";resolution:=optional,
javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}";resolution:=optional,
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
diff --git a/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf
deleted file mode 100644
index ab8eb53..0000000
--- a/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf
+++ /dev/null
@@ -1,59 +0,0 @@
-Bundle-SymbolicName: org.springframework.web
-Bundle-Name: Spring Web
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- com.caucho.*;version="${hessianVersion:[=.=.=, +1)}";resolution:=optional,
- com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
- com.google.gson.*;version="${gsonVersion:[=.=.=, +1)}";resolution:=optional,
- com.google.protobuf;version="${protobufJavaVersion:[=.=.=, +1)}";resolution:=optional,
- com.googlecode.protobuf.format;version="${protobufJavaFormatVersion:[=.=.=, +1)}";resolution:=optional,
- com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
- com.squareup.okhttp.*;version="${okhttpVersion:[=.=.=, +1)}";resolution:=optional,
- com.sun.net.*;version="0";resolution:=optional,
- groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[2.2.5, 3)";resolution:=optional,
- javax.faces.*;version="[2.2, 3)";resolution:=optional,
- javax.imageio.*;version="0";resolution:=optional,
- javax.jws.*;version="0";resolution:=optional,
- javax.mail.*;version="[1.5, 2)";resolution:=optional,
- javax.portlet.*;version="[2, 3)";resolution:=optional,
- javax.servlet.*;version="[2.4, 4)",
- javax.servlet.annotation;version="[3, 4)";resolution:=optional,
- javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
- javax.validation.*;version="[1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.http.*;version="[4.1.0, 5.0.0)";resolution:=optional,
- org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
- org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.http.*;version="${springframeworkVersion}",
- org.springframework.remoting.*;version="${springframeworkVersion}",
- org.springframework.web.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 71a51f6..0000000
--- a/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-web', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.web-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.web-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.web-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.web-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-5.0.4.RELEASE/org.springframework.web.mf
similarity index 75%
rename from ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf
rename to ebr/org.springframework.web-5.0.4.RELEASE/org.springframework.web.mf
index a0497af..35914af 100644
--- a/ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf
+++ b/ebr/org.springframework.web-5.0.4.RELEASE/org.springframework.web.mf
@@ -7,11 +7,11 @@
org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
com.caucho.*;version="${hessianVersion:[=.=.=, +1)}";resolution:=optional,
com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.fasterxml.aalto.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
com.google.gson.*;version="${gsonVersion:[=.=.=, +1)}";resolution:=optional,
- com.google.protobuf;version="${protobufJavaVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.protobuf.*;version="${protobufJavaVersion:[=.=.=, +1)}";resolution:=optional,
com.googlecode.protobuf.format;version="${protobufJavaFormatVersion:[=.=.=, +1)}";resolution:=optional,
com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
- com.squareup.okhttp.*;version="${okhttpVersion:[=.=.=, +1)}";resolution:=optional,
com.squareup.okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
com.sun.net.*;version="0";resolution:=optional,
@@ -24,7 +24,7 @@
javax.jws.*;version="0";resolution:=optional,
javax.mail.*;version="[1.5, 2)";resolution:=optional,
javax.portlet.*;version="[2, 3)";resolution:=optional,
- javax.servlet.*;version="[2.4, 4)",
+ javax.servlet.*;version="[3.1, 4)";resolution:=optional,
javax.servlet.annotation;version="[3, 4)";resolution:=optional,
javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
javax.validation.*;version="[1, 2)";resolution:=optional,
@@ -50,7 +50,19 @@
org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
+ org.w3c.dom.*;version="0";resolution:=optional,
+ io.undertow.*;version="${undertowVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.catalina.*;version="${apacheCatalinaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.jetty.*;version="${jettyVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.core.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.ipc.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.util.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.json.bind;version="0";resolution:=optional,
+ org.synchronoss.cloud.nio.*;version="0";resolution:=optional,
+ org.xnio.*;version="0";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
Export-Template:
org.springframework.http.*;version="${springframeworkVersion}",
org.springframework.remoting.*;version="${springframeworkVersion}",
diff --git a/ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.webflux-5.0.4.RELEASE/build.gradle
similarity index 64%
rename from ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle
rename to ebr/org.springframework.webflux-5.0.4.RELEASE/build.gradle
index ac18802..de2312b 100644
--- a/ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle
+++ b/ebr/org.springframework.webflux-5.0.4.RELEASE/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
+ sourceBundle group: 'org.springframework', name: 'spring-webflux', version: "${springframeworkVersion}"
}
diff --git a/ebr/org.springframework.webflux-5.0.4.RELEASE/org.springframework.webflux.mf b/ebr/org.springframework.webflux-5.0.4.RELEASE/org.springframework.webflux.mf
new file mode 100644
index 0000000..3ec226b
--- /dev/null
+++ b/ebr/org.springframework.webflux-5.0.4.RELEASE/org.springframework.webflux.mf
@@ -0,0 +1,44 @@
+Bundle-SymbolicName: org.springframework.webflux
+Bundle-Name: Spring Webflux
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.script;version="0";resotion:=optional,
+ javax.servlet.*;version="[3.1, 4)";resolution:=optional,
+ javax.websocket.*;version="[1, 2)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.webjars;version="0";resolution:=optional,
+ org.xnio.*;version="0";resolution:=optional,
+ freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ io.undertow.*;version="${undertowVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.tomcat.*;version="${apacheCatalinaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.jetty.*;version="${jettyVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scripting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ reactor.core.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.ipc.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ reactor.util.*;version="${reactorCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional,
+ kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
+ org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";resolution:="optional"
+Export-Template:
+ org.springframework.webflux.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf
deleted file mode 100644
index 7252e6f..0000000
--- a/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf
+++ /dev/null
@@ -1,62 +0,0 @@
-Bundle-SymbolicName: org.springframework.webmvc
-Bundle-Name: Spring Web MVC
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Package:
- org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
- com.lowagie.text.*;version="[2.0.8, 3)";resolution:=optional,
- com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
- com.sun.syndication.*;version="[1, 2)";resolution:=optional,
- freemarker.*;version="[2.3.14, 3)";resolution:=optional,
- groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[2.2.5, 4)";resolution:=optional,
- javax.script;version="0";resotion:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.servlet.*;version="[3.0.1, 4)",
- javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
- javax.servlet.jsp.jstl.*;version="[1.2.1, 2)";resolution:=optional,
- javax.validation.*;version="[1, 2)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- javax.xml.bind.*;version="0";resolution:=optional,
- jxl.*;version="${jxlVersion:[=.=.=, +1)}";resolution:=optional,
- net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.poi.*;version="${poiVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.tiles.*;version="[2.2.2, 4)";resolution:=optional,
- org.apache.tiles.request.*;version="[1, 2)";resolution:=optional,
- org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
- org.codehaus.jackson.*;version="[1.3.0, 2)";resolution:=optional,
- org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scripting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.xml.sax.*;version="0";resolution:=optional,
- org.webjars.*;version="${webjarsVersion:[=.=.=, +1)}";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional,
- edu.emory.mathcs.backport.*;version="[3, 4)";resolution:=optional
-Export-Template:
- org.springframework.web.servlet.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.webmvc-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-5.0.4.RELEASE/org.springframework.webmvc.mf
similarity index 93%
rename from ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf
rename to ebr/org.springframework.webmvc-5.0.4.RELEASE/org.springframework.webmvc.mf
index 7252e6f..d46a09e 100644
--- a/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf
+++ b/ebr/org.springframework.webmvc-5.0.4.RELEASE/org.springframework.webmvc.mf
@@ -11,13 +11,13 @@
com.lowagie.text.*;version="[2.0.8, 3)";resolution:=optional,
com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
com.sun.syndication.*;version="[1, 2)";resolution:=optional,
- freemarker.*;version="[2.3.14, 3)";resolution:=optional,
+ freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
javax.activation.*;version="0";resolution:=optional,
javax.el.*;version="[2.2.5, 4)";resolution:=optional,
javax.script;version="0";resotion:=optional,
javax.sql.*;version="0";resolution:=optional,
- javax.servlet.*;version="[3.0.1, 4)",
+ javax.servlet.*;version="[3.1, 4)";resolution:=optional,
javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
javax.servlet.jsp.jstl.*;version="[1.2.1, 2)";resolution:=optional,
javax.validation.*;version="[1, 2)";resolution:=optional,
@@ -52,7 +52,8 @@
org.xml.sax.*;version="0";resolution:=optional,
org.webjars.*;version="${webjarsVersion:[=.=.=, +1)}";resolution:=optional,
org.w3c.dom.*;version="0";resolution:=optional,
- edu.emory.mathcs.backport.*;version="[3, 4)";resolution:=optional
+ edu.emory.mathcs.backport.*;version="[3, 4)";resolution:=optional,
+ org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";resolution:=optional
Export-Template:
org.springframework.web.servlet.*;version="${springframeworkVersion}"
Ignored-Existing-Headers:
diff --git a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 4f47288..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc-portlet', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf
deleted file mode 100644
index 9b5b967..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-Bundle-SymbolicName: org.springframework.webmvc.portlet
-Bundle-Name: Spring Web MVC Portlet
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.portlet.*;version="[2, 3)",
- javax.servlet.*;version="[3.0.1, 4)",
- javax.xml.*;version="0";resolution:=optional,
- org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.xml.sax.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.web.portlet.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index 4f47288..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc-portlet', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf
deleted file mode 100644
index 9b5b967..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-Bundle-SymbolicName: org.springframework.webmvc.portlet
-Bundle-Name: Spring Web MVC Portlet
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- javax.portlet.*;version="[2, 3)",
- javax.servlet.*;version="[3.0.1, 4)",
- javax.xml.*;version="0";resolution:=optional,
- org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.xml.sax.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.web.portlet.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle
deleted file mode 100644
index a86cf8e..0000000
--- a/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-websocket', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf
deleted file mode 100644
index 6935ab3..0000000
--- a/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf
+++ /dev/null
@@ -1,33 +0,0 @@
-Bundle-SymbolicName: org.springframework.websocket
-Bundle-Name: Spring Websocket
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
- io.undertow.*;version="${undertowVersion:[=.=.=, +1)}";resolution:=optional,
- javax.servlet.*;version="[3.1, 4)";resolution:=optional,
- javax.websocket.*;version="[1, 2)";resolution:=optional,
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.apache.tomcat.websocket.server;version="[8.0.30, 9)";resolution:=optional,
- org.eclipse.jetty.*;version="[9.3.6.v20151106, 10)";resolution:=optional,
- org.glassfish.tyrus.*;version="[1.3.5, 2)";resolution:=optional,
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.w3c.dom.*;version="0";resolution:=optional,
- org.xnio.*;version="0";resolution:=optional
-Export-Template:
- org.springframework.web.socket.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.websocket-5.0.4.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle
rename to ebr/org.springframework.websocket-5.0.4.RELEASE/build.gradle
diff --git a/ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-5.0.4.RELEASE/org.springframework.websocket.mf
similarity index 100%
rename from ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf
rename to ebr/org.springframework.websocket-5.0.4.RELEASE/org.springframework.websocket.mf
diff --git a/ebr/out/test/classes/org/eclipse/virgo/ebr/AbstractBaseTest.class b/ebr/out/test/classes/org/eclipse/virgo/ebr/AbstractBaseTest.class
new file mode 100644
index 0000000..456bf7d
--- /dev/null
+++ b/ebr/out/test/classes/org/eclipse/virgo/ebr/AbstractBaseTest.class
Binary files differ
diff --git a/ebr/out/test/classes/org/eclipse/virgo/ebr/OkHttp3Test.class b/ebr/out/test/classes/org/eclipse/virgo/ebr/OkHttp3Test.class
new file mode 100644
index 0000000..1632c87
--- /dev/null
+++ b/ebr/out/test/classes/org/eclipse/virgo/ebr/OkHttp3Test.class
Binary files differ
diff --git a/ebr/out/test/classes/org/eclipse/virgo/ebr/SpringFrameworkTest.class b/ebr/out/test/classes/org/eclipse/virgo/ebr/SpringFrameworkTest.class
new file mode 100644
index 0000000..8e8314d
--- /dev/null
+++ b/ebr/out/test/classes/org/eclipse/virgo/ebr/SpringFrameworkTest.class
Binary files differ
diff --git a/ebr/settings.gradle b/ebr/settings.gradle
index 76a421c..f0efbf2 100644
--- a/ebr/settings.gradle
+++ b/ebr/settings.gradle
@@ -5,6 +5,7 @@
include "org.springframework.context.support-${springframeworkVersion}"
include "org.springframework.core-${springframeworkVersion}"
include "org.springframework.expression-${springframeworkVersion}"
+include "org.springframework.jcl-${springframeworkVersion}"
include "org.springframework.jdbc-${springframeworkVersion}"
include "org.springframework.jms-${springframeworkVersion}"
include "org.springframework.messaging-${springframeworkVersion}"
@@ -12,8 +13,8 @@
include "org.springframework.oxm-${springframeworkVersion}"
include "org.springframework.transaction-${springframeworkVersion}"
include "org.springframework.web-${springframeworkVersion}"
+include "org.springframework.webflux-${springframeworkVersion}"
include "org.springframework.webmvc-${springframeworkVersion}"
-include "org.springframework.webmvc.portlet-${springframeworkVersion}"
include "org.springframework.websocket-${springframeworkVersion}"
include "org.springframework.test-${springframeworkVersion}"
include "org.aspectj.weaver-${aspectjVersion}"
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java b/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
index 81e0abf..8ed0557 100644
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
+++ b/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
@@ -14,10 +14,10 @@
public class OkHttp3Test extends AbstractBaseTest {
private static final String OKIO = "com.squareup.okio";
- private static final String OKIO_VERSION = "1.13.0";
+ private static final String OKIO_VERSION = "1.14.0";
private static final String OKHTTP3 = "com.squareup.okhttp3";
- private static final String OKHTTP3_VERSION = "3.8.0";
+ private static final String OKHTTP3_VERSION = "3.9.1";
@Configuration
@Override
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java b/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
index b299a0e..11dd454 100644
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
+++ b/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
@@ -14,9 +14,9 @@
public class SpringFrameworkTest extends AbstractBaseTest {
private static final String ASPECTJ_WEAVER = "org.aspectj.weaver";
- private static final String ASPECTJ_WEAVER_VERSION = "1.8.10";
+ private static final String ASPECTJ_WEAVER_VERSION = "1.8.13";
- private static final String SF_VERSION = "4.3.9.RELEASE";
+ private static final String SF_VERSION = "5.0.4.RELEASE";
private static final String SF_PREFIX = "org.springframework.";
private static final String SF_CORE = SF_PREFIX + "core";
private static final String SF_BEANS = SF_PREFIX + "beans";
@@ -27,13 +27,14 @@
private static final String SF_CONTEXT_SUPPORT = SF_PREFIX + "context.support";
private static final String SF_TRANSACTION = SF_PREFIX + "transaction";
private static final String SF_JDBC = SF_PREFIX + "jdbc";
+ private static final String SF_JCL = SF_PREFIX + "jcl";
private static final String SF_MESSAGING = SF_PREFIX + "messaging";
private static final String SF_JMS = SF_PREFIX + "jms";
private static final String SF_ORM = SF_PREFIX + "orm";
private static final String SF_OXM = SF_PREFIX + "oxm";
private static final String SF_WEB = SF_PREFIX + "web";
+ private static final String SF_WEBFLUX = SF_PREFIX + "webflux";
private static final String SF_WEBMVC = SF_PREFIX + "webmvc";
- private static final String SF_WEBMVC_PORTLET = SF_PREFIX + "webmvc.portlet";
private static final String SF_WEBSOCKET = SF_PREFIX + "websocket";
@Configuration
@@ -58,12 +59,13 @@
mavenBundle(MIRROR_GROUP, SF_TRANSACTION, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_JDBC, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_MESSAGING, SF_VERSION),
+ mavenBundle(MIRROR_GROUP, SF_JCL, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_JMS, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_ORM, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_OXM, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_WEB, SF_VERSION),
+ mavenBundle(MIRROR_GROUP, SF_WEBFLUX, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_WEBMVC, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_WEBMVC_PORTLET, SF_VERSION),
mavenBundle(MIRROR_GROUP, SF_WEBSOCKET, SF_VERSION),
// specify junit bundles
junitBundles()
@@ -116,6 +118,11 @@
}
@Test
+ public void testSpringJcl() throws Exception {
+ assertBundleActive(SF_JCL);
+ }
+
+ @Test
public void testSpringJdbc() throws Exception {
assertBundleActive(SF_JDBC);
}
@@ -146,13 +153,13 @@
}
@Test
- public void testSpringWebMvc() throws Exception {
- assertBundleActive(SF_WEBMVC);
+ public void testSpringWebflux() throws Exception {
+ assertBundleActive(SF_WEBFLUX);
}
@Test
- public void testSpringWebMvcPortlet() throws Exception {
- assertBundleActive(SF_WEBMVC_PORTLET);
+ public void testSpringWebMvc() throws Exception {
+ assertBundleActive(SF_WEBMVC);
}
@Test
