Bump Spring Framework version to 4.3.27.RELEASE
diff --git a/ebr/README.md b/ebr/README.md
index 9aab256..1848874 100644
--- a/ebr/README.md
+++ b/ebr/README.md
@@ -10,12 +10,12 @@
2. `bundlor` - Generates the OSGi metadata plus jar bundles
3. `publishToMavenLocal` - Publishes jar bundles to `[USER_HOME]/.m2/org/eclipse/virgo/mirrored/[artifactId]/[version]/[bundle].jar`
4. `test` - Executes the PaxExam tests, the bundles are resolved against local Maven repo thus `publishToMavenLocal` is required to be executed before `test`
- 5. `publishIvyPublicationToIvyRepository` - Publishes the jar bundles to `build.eclipse.org` ivy repo (only possible on HIPP)
+ 5. !!Note!! Doesn't work anymore! No access to /opt/... `publishIvyPublicationToIvyRepository` - Publishes the jar bundles to `build.eclipse.org` ivy repo (only possible on HIPP)
Build and test locally:
```bash
-$ ./gradlew clean bundlor publishToMavenLocal test
+./gradlew clean bundlor publishToMavenLocal test
```
## Update Version of a Spring Framework stream
@@ -26,3 +26,11 @@
## Add a new Spring Framework stream
* Create new folder structure e.g. `5.1.<version>`
+
+## Publishing (from local build)
+
+```bash
+./gradlew clean bundlor publishIvyPublicationToIvyRepository
+```
+
+Upload via `publish.sh`...until we know how to populate from our JIPP.
diff --git a/ebr/build.gradle b/ebr/build.gradle
index a1b2bdc..cdf3095 100644
--- a/ebr/build.gradle
+++ b/ebr/build.gradle
@@ -15,10 +15,10 @@
repositories {
mavenCentral()
maven {
- url "http://build.eclipse.org/rt/virgo/gradle/bundles"
+ url "https://build.eclipse.org/rt/virgo/gradle/bundles"
}
ivy {
- url "http://build.eclipse.org/rt/virgo/ivy/bundles/release/"
+ url "https://build.eclipse.org/rt/virgo/ivy/bundles/release/"
layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
}
}
@@ -90,7 +90,11 @@
}
repositories {
ivy {
- url "/opt/public/rt/virgo/ivy/bundles/release"
+ // doesn't work anymore on JIPP - no access to /opt/public
+// url "/opt/public/rt/virgo/ivy/bundles/release"
+ // use this path and the script publish.sh to push the bundles to build server
+ url "/tmp/ivy"
+// url "/home/data/httpd/download.eclipse.org/virgo"
}
}
}
diff --git a/ebr/gradle.properties b/ebr/gradle.properties
index 24a6aac..d27ce3b 100644
--- a/ebr/gradle.properties
+++ b/ebr/gradle.properties
@@ -129,7 +129,7 @@
#CQ 13704 org.springframework.webmvc
#CQ 13705 org.springframework.webmvc.portlet
#CQ 13706 org.springframework.websocket
-springframeworkVersion = 4.3.26.RELEASE
+springframeworkVersion = 4.3.27.RELEASE
geminiManagementVersion = 1.0.5.RELEASE
geminiWebVersion = 3.0.0.RC3
diff --git a/ebr/org.springframework.aop-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.aop-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.aop-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.aop-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.aop-4.3.26.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-4.3.27.RELEASE/org.springframework.aop.mf
similarity index 100%
rename from ebr/org.springframework.aop-4.3.26.RELEASE/org.springframework.aop.mf
rename to ebr/org.springframework.aop-4.3.27.RELEASE/org.springframework.aop.mf
diff --git a/ebr/org.springframework.aspects-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.aspects-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.aspects-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.aspects-4.3.26.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-4.3.27.RELEASE/org.springframework.aspects.mf
similarity index 100%
rename from ebr/org.springframework.aspects-4.3.26.RELEASE/org.springframework.aspects.mf
rename to ebr/org.springframework.aspects-4.3.27.RELEASE/org.springframework.aspects.mf
diff --git a/ebr/org.springframework.beans-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.beans-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.beans-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.beans-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.beans-4.3.26.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.3.27.RELEASE/org.springframework.beans.mf
similarity index 100%
rename from ebr/org.springframework.beans-4.3.26.RELEASE/org.springframework.beans.mf
rename to ebr/org.springframework.beans-4.3.27.RELEASE/org.springframework.beans.mf
diff --git a/ebr/org.springframework.context-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.context-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.context-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.context-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.context-4.3.26.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.3.27.RELEASE/org.springframework.context.mf
similarity index 100%
rename from ebr/org.springframework.context-4.3.26.RELEASE/org.springframework.context.mf
rename to ebr/org.springframework.context-4.3.27.RELEASE/org.springframework.context.mf
diff --git a/ebr/org.springframework.context.support-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.context.support-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.context.support-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.context.support-4.3.26.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-4.3.27.RELEASE/org.springframework.context.support.mf
similarity index 100%
rename from ebr/org.springframework.context.support-4.3.26.RELEASE/org.springframework.context.support.mf
rename to ebr/org.springframework.context.support-4.3.27.RELEASE/org.springframework.context.support.mf
diff --git a/ebr/org.springframework.core-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.core-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.core-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.core-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.core-4.3.26.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-4.3.27.RELEASE/org.springframework.core.mf
similarity index 100%
rename from ebr/org.springframework.core-4.3.26.RELEASE/org.springframework.core.mf
rename to ebr/org.springframework.core-4.3.27.RELEASE/org.springframework.core.mf
diff --git a/ebr/org.springframework.core-4.3.26.RELEASE/src/test/resources/bundle.conf b/ebr/org.springframework.core-4.3.27.RELEASE/src/test/resources/bundle.conf
similarity index 100%
rename from ebr/org.springframework.core-4.3.26.RELEASE/src/test/resources/bundle.conf
rename to ebr/org.springframework.core-4.3.27.RELEASE/src/test/resources/bundle.conf
diff --git a/ebr/org.springframework.expression-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.expression-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.expression-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.expression-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.expression-4.3.26.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.3.27.RELEASE/org.springframework.expression.mf
similarity index 100%
rename from ebr/org.springframework.expression-4.3.26.RELEASE/org.springframework.expression.mf
rename to ebr/org.springframework.expression-4.3.27.RELEASE/org.springframework.expression.mf
diff --git a/ebr/org.springframework.jdbc-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.jdbc-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.jdbc-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.jdbc-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.jdbc-4.3.26.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.3.27.RELEASE/org.springframework.jdbc.mf
similarity index 100%
rename from ebr/org.springframework.jdbc-4.3.26.RELEASE/org.springframework.jdbc.mf
rename to ebr/org.springframework.jdbc-4.3.27.RELEASE/org.springframework.jdbc.mf
diff --git a/ebr/org.springframework.jms-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.jms-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.jms-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.jms-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.jms-4.3.26.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-4.3.27.RELEASE/org.springframework.jms.mf
similarity index 100%
rename from ebr/org.springframework.jms-4.3.26.RELEASE/org.springframework.jms.mf
rename to ebr/org.springframework.jms-4.3.27.RELEASE/org.springframework.jms.mf
diff --git a/ebr/org.springframework.messaging-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.messaging-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.messaging-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.messaging-4.3.26.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.3.27.RELEASE/org.springframework.messaging.mf
similarity index 100%
rename from ebr/org.springframework.messaging-4.3.26.RELEASE/org.springframework.messaging.mf
rename to ebr/org.springframework.messaging-4.3.27.RELEASE/org.springframework.messaging.mf
diff --git a/ebr/org.springframework.orm-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.orm-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.orm-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.orm-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.orm-4.3.26.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.3.27.RELEASE/org.springframework.orm.mf
similarity index 100%
rename from ebr/org.springframework.orm-4.3.26.RELEASE/org.springframework.orm.mf
rename to ebr/org.springframework.orm-4.3.27.RELEASE/org.springframework.orm.mf
diff --git a/ebr/org.springframework.oxm-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.oxm-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.oxm-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.oxm-4.3.26.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.3.27.RELEASE/org.springframework.oxm.mf
similarity index 100%
rename from ebr/org.springframework.oxm-4.3.26.RELEASE/org.springframework.oxm.mf
rename to ebr/org.springframework.oxm-4.3.27.RELEASE/org.springframework.oxm.mf
diff --git a/ebr/org.springframework.test-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.test-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.test-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.test-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.test-4.3.26.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-4.3.27.RELEASE/org.springframework.test.mf
similarity index 100%
rename from ebr/org.springframework.test-4.3.26.RELEASE/org.springframework.test.mf
rename to ebr/org.springframework.test-4.3.27.RELEASE/org.springframework.test.mf
diff --git a/ebr/org.springframework.transaction-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.transaction-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.transaction-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.transaction-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.transaction-4.3.26.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.3.27.RELEASE/org.springframework.transaction.mf
similarity index 100%
rename from ebr/org.springframework.transaction-4.3.26.RELEASE/org.springframework.transaction.mf
rename to ebr/org.springframework.transaction-4.3.27.RELEASE/org.springframework.transaction.mf
diff --git a/ebr/org.springframework.web-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.web-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.web-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.web-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.web-4.3.26.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-4.3.27.RELEASE/org.springframework.web.mf
similarity index 100%
rename from ebr/org.springframework.web-4.3.26.RELEASE/org.springframework.web.mf
rename to ebr/org.springframework.web-4.3.27.RELEASE/org.springframework.web.mf
diff --git a/ebr/org.springframework.webmvc-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.webmvc-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.webmvc-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.webmvc-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.webmvc-4.3.26.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.3.27.RELEASE/org.springframework.webmvc.mf
similarity index 100%
rename from ebr/org.springframework.webmvc-4.3.26.RELEASE/org.springframework.webmvc.mf
rename to ebr/org.springframework.webmvc-4.3.27.RELEASE/org.springframework.webmvc.mf
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.webmvc.portlet-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.webmvc.portlet-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.26.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.3.27.RELEASE/org.springframework.webmvc.portlet.mf
similarity index 100%
rename from ebr/org.springframework.webmvc.portlet-4.3.26.RELEASE/org.springframework.webmvc.portlet.mf
rename to ebr/org.springframework.webmvc.portlet-4.3.27.RELEASE/org.springframework.webmvc.portlet.mf
diff --git a/ebr/org.springframework.websocket-4.3.26.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.3.27.RELEASE/build.gradle
similarity index 100%
rename from ebr/org.springframework.websocket-4.3.26.RELEASE/build.gradle
rename to ebr/org.springframework.websocket-4.3.27.RELEASE/build.gradle
diff --git a/ebr/org.springframework.websocket-4.3.26.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.3.27.RELEASE/org.springframework.websocket.mf
similarity index 100%
rename from ebr/org.springframework.websocket-4.3.26.RELEASE/org.springframework.websocket.mf
rename to ebr/org.springframework.websocket-4.3.27.RELEASE/org.springframework.websocket.mf
diff --git a/ebr/publish.sh b/ebr/publish.sh
new file mode 100755
index 0000000..d5b91e1
--- /dev/null
+++ b/ebr/publish.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+SPRING_VERSION=4.3.26.RELEASE
+
+for module in "test" aop aspects beans context context.support core expression jdbc jms messaging orm oxm transaction web webmvc webmvc.portlet websocket; do
+ scp -r /tmp/ivy/org.eclipse.virgo.mirrored/org.springframework.${module}/${SPRING_VERSION} virgoBuild@build.eclipse.org:/shared/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/org.springframework.${module}
+done
