Replace module :ebr in favour of :3rd-party
Also
* bump Gradle to version 5.6.3,
* replace module ebr with a stub,
* streamline junit usage,
* rework FileMovingArtifactStoreTests,
* remove unused import in BundleUtils,
* switch to maven central for
** hibernate, javax.inject,
** commons-codec, comons-cli,
* remove taglib.standard from VTS and
* bump portlet-api to 3.0.1.
Note: This commit imports springframework lang/util into
userregion
Change-Id: I0723197636e90cb806c242c8090297bae5fa7070
diff --git a/3rd-party/build.gradle b/3rd-party/build.gradle
index c1f7667..5a374f2 100644
--- a/3rd-party/build.gradle
+++ b/3rd-party/build.gradle
@@ -4,13 +4,26 @@
platform {
fetchSources = false
- useBndHashQualifiers =false
+ useBndHashQualifiers = false
defaultQualifier = ''
bnd {
instruction 'Bundle-Vendor', 'Eclipse Virgo'
}
+ bundle('org.aspectj:aspectjweaver') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.aspectj.weaver'
+ instruction 'Import-Package', 'sun.misc.*;resolution:=optional,com.bea.jvm.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional, *'
+ }
+ }
+
+ bundle('aopalliance:aopalliance') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.aopalliance.aopalliance'
+ }
+ }
+
bundle('org.apache.httpcomponents:httpcore') {
bnd {
instruction 'Bundle-SymbolicName', 'oevm.org.apache.httpcomponents.httpcore'
@@ -22,4 +35,330 @@
instruction 'Bundle-SymbolicName', 'oevm.org.apache.httpcomponents.httpclient'
}
}
+
+ bundle('org.springframework:spring-aop') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.aop'
+ optionalImport 'com.jamonapi.*'
+ optionalImport 'org.apache.commons.pool.*'
+ optionalImport 'org.apache.commons.pool2.*'
+ optionalImport 'org.aspectj.*'
+ optionalImport 'org.springframework.cglib.*'
+ optionalImport 'org.codehaus.groovy.*'
+ }
+ }
+
+ bundle('org.springframework:spring-aspects') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.aspects'
+ }
+ }
+
+ bundle('org.springframework:spring-beans') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.beans'
+ optionalImport 'javax.el.*'
+ optionalImport 'javax.inject.*'
+ optionalImport 'javax.xml.*'
+ optionalImport 'groovy.*'
+ optionalImport 'org.yaml.snakeyaml.*'
+ optionalImport 'org.codehaus.groovy.*'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.jetbrains.annotations.*'
+ }
+ }
+
+ bundle('org.springframework:spring-context') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.context'
+ optionalImport 'bsh.*'
+ optionalImport 'com.sun.net.*'
+ optionalImport 'edu.emory.mathcs.backport.*'
+ optionalImport 'groovy.*'
+ optionalImport 'javax.annotation.*'
+ optionalImport 'javax.cache.*'
+ optionalImport 'javax.ejb.*'
+ optionalImport 'javax.enterprise.concurrent'
+ optionalImport 'javax.interceptor.*'
+ optionalImport 'javax.jms.*'
+ optionalImport 'javax.management.*'
+ optionalImport 'javax.money.*'
+ optionalImport 'javax.naming.*'
+ optionalImport 'javax.persistence.*'
+ optionalImport 'javax.rmi.*'
+ optionalImport 'javax.script'
+ optionalImport 'javax.validation.*'
+ optionalImport 'javax.xml.*'
+ optionalImport 'net.sf.ehcache.*'
+ optionalImport 'org.apache.commons.logging.*'
+ optionalImport 'org.aspectj.*'
+ optionalImport 'org.codehaus.groovy.*'
+ optionalImport 'org.hibernate.validator.*'
+ optionalImport 'org.joda.*'
+ optionalImport 'org.omg.CORBA.*'
+ optionalImport 'org.jruby.*'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.jetbrains.annotations.*'
+ optionalImport 'org.springframework.instrument'
+ }
+ }
+
+ bundle('org.springframework:spring-context-support') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.context.support'
+ optionalImport 'com.github.benmanes.caffeine.cache'
+ optionalImport 'commonj.*'
+ optionalImport 'freemarker.*'
+ optionalImport 'javax.cache.*'
+ optionalImport 'javax.mail.*'
+ optionalImport 'net.sf.ehcache.*'
+ optionalImport 'org.quartz.*'
+ }
+ }
+
+ bundle('org.springframework:spring-core') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.core'
+ optionalImport 'android.os.*'
+ optionalImport 'joptsimple.*'
+ optionalImport 'org.apache.tools.ant.*'
+ optionalImport 'org.apache.commons.codec.*'
+ optionalImport 'org.apache.log4j.*'
+ optionalImport 'org.aspectj.*'
+ optionalImport 'javax.annotation.*'
+ optionalImport 'io.netty.*'
+ optionalImport 'reactor.core.*'
+ optionalImport 'reactor.adapter.*'
+ optionalImport 'org.reactivestreams.*'
+ optionalImport 'io.reactivex.*'
+ optionalImport 'rx.*'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.jetbrains.annotations.*'
+ optionalImport 'COM.newmonics.PercClassLoader'
+ optionalImport 'sun.*'
+ // FIXME Equinox migration check strange import issue with 'org.springframework.asm.util'
+ optionalImport 'org.springframework.asm.util'
+ }
+ }
+
+ bundle('org.springframework:spring-expression') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.expression'
+ }
+ }
+
+ bundle('org.springframework:spring-jcl') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.jcl'
+ optionalImport 'org.apache.logging.log4j.*'
+ optionalImport 'org.apache.log4j.*'
+ optionalImport 'org.slf4j.*'
+ }
+ }
+
+ bundle('org.springframework:spring-jdbc') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.jdbc'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.apache.derby.jdbc'
+ }
+ }
+
+ bundle('org.springframework:spring-jms') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.jms'
+ optionalImport 'com.fasterxml.jackson.*'
+ optionalImport 'javax.jms'
+ optionalImport 'javax.resource.*'
+ }
+ }
+
+ bundle('org.springframework:spring-messaging') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.messaging'
+ optionalImport 'com.fasterxml.jackson.*'
+ optionalImport 'io.netty.*'
+ optionalImport 'org.reactivestreams.*'
+ optionalImport 'reactor.core.*'
+ optionalImport 'reactor.ipc.*'
+ }
+ }
+
+ bundle('org.springframework:spring-orm') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.orm'
+ optionalImport 'javax.persistence'
+ optionalImport 'javax.persistence.spi'
+ optionalImport 'org.eclipse.persistence.*'
+ optionalImport 'org.hibernate.*'
+ }
+ }
+
+ bundle('org.springframework:spring-oxm') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.oxm'
+ optionalImport 'com.thoughtworks.xstream.*'
+ optionalImport 'javax.activation.*'
+ optionalImport 'javax.xml.*'
+ optionalImport 'javax.xml.bind.*'
+ optionalImport 'com.thoughtworks.xstream.*'
+ optionalImport 'org.apache.commons.logging.*'
+ optionalImport 'org.apache.xmlbeans.*'
+ optionalImport 'org.exolab.castor.*'
+ optionalImport 'org.jibx.runtime.*'
+ instruction 'Import', 'org.w3c.dom.*;version="0"'
+ instruction 'Import', 'org.xml.sax.*;version="0"'
+ }
+ }
+
+ bundle('org.springframework:spring-tx') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.transaction'
+ optionalImport 'com.ibm.wsspi.uow'
+ optionalImport 'javax.ejb'
+ optionalImport 'javax.resource.*'
+ }
+ }
+
+ bundle('org.springframework:spring-web') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.web'
+ optionalImport 'com.caucho.*'
+ optionalImport 'com.fasterxml.aalto.*'
+ optionalImport 'com.fasterxml.jackson.*'
+ optionalImport 'com.google.gson.*'
+ optionalImport 'com.google.protobuf.*'
+ optionalImport 'com.googlecode.protobuf.format'
+ optionalImport 'com.rometools.rome.*'
+ optionalImport 'com.squareup.okhttp3.*'
+ optionalImport 'okhttp3.*'
+ optionalImport 'com.sun.net.*'
+ optionalImport 'groovy.*'
+ optionalImport 'io.netty.*'
+ optionalImport 'javax.activation.*'
+ optionalImport 'javax.el.*'
+ optionalImport 'javax.faces.*'
+ optionalImport 'javax.imageio.*'
+ optionalImport 'javax.jws.*'
+ optionalImport 'javax.mail.*'
+ optionalImport 'javax.portlet.*'
+ optionalImport 'javax.servlet.*'
+ optionalImport 'javax.servlet.annotation'
+ optionalImport 'javax.servlet.jsp.*'
+ optionalImport 'javax.validation.*'
+ optionalImport 'javax.xml.*'
+ optionalImport 'javax.net.ssl'
+ optionalImport 'org.apache.commons.fileupload.*'
+ optionalImport 'org.apache.commons.httpclient.*'
+ optionalImport 'org.apache.commons.logging.*'
+ optionalImport 'org.apache.http.*'
+ optionalImport 'org.apache.log4j.*'
+ optionalImport 'org.codehaus.jackson.*'
+ optionalImport 'org.xml.sax.*'
+ optionalImport 'org.w3c.dom.*'
+ optionalImport 'io.undertow.*'
+ optionalImport 'org.apache.catalina.*'
+ optionalImport 'org.eclipse.jetty.*'
+ optionalImport 'reactor.core.*'
+ optionalImport 'reactor.ipc.*'
+ optionalImport 'reactor.util.*'
+ optionalImport 'javax.json.bind'
+ optionalImport 'org.synchronoss.cloud.nio.*'
+ optionalImport 'org.xnio.*'
+ optionalImport 'org.reactivestreams.*'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.jetbrains.annotations.*'
+ }
+ }
+
+ bundle('org.springframework:spring-webflux') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.webflux'
+ optionalImport 'freemarker.*'
+ optionalImport 'io.netty.*'
+ optionalImport 'io.undertow.*'
+ optionalImport 'javax.websocket.*'
+ optionalImport 'kotlin.*'
+ optionalImport 'org.apache.tomcat.websocket.*'
+ optionalImport 'org.eclipse.jetty.websocket.*'
+ optionalImport 'org.reactivestreams.*'
+ optionalImport 'org.webjars'
+ optionalImport 'org.xnio'
+ optionalImport 'reactor.core.*'
+ optionalImport 'reactor.ipc.*'
+ optionalImport 'reactor.util.*'
+ }
+ }
+
+ bundle('org.springframework:spring-webmvc') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.webmvc'
+ optionalImport 'com.fasterxml.jackson.*'
+ optionalImport 'com.lowagie.text.*'
+ optionalImport 'com.rometools.rome.*'
+ optionalImport 'freemarker.*'
+ optionalImport 'groovy.*'
+ optionalImport 'org.apache.poi.*'
+ optionalImport 'org.apache.tiles.*'
+ optionalImport 'org.reactivestreams.*'
+ optionalImport 'org.webjars'
+ }
+ }
+
+ bundle('org.springframework:spring-websocket') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.org.springframework.websocket'
+ optionalImport 'com.fasterxml.jackson.*'
+ optionalImport 'io.undertow.*'
+ optionalImport 'javax.websocket.*'
+ optionalImport 'org.apache.tomcat.websocket.*'
+ optionalImport 'org.eclipse.jetty.*'
+ optionalImport 'org.glassfish.tyrus.*'
+ optionalImport 'org.xnio.*'
+ }
+ }
+
+ bundle('com.squareup.okio:okio') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.com.squareup.okio'
+ optionalImport 'javax.annotation'
+ optionalImport 'javax.crypto.*'
+ optionalImport 'org.codehaus.mojo.animal_sniffer'
+ }
+ }
+
+ bundle('com.squareup.okhttp3:okhttp') {
+ bnd {
+ instruction 'Bundle-SymbolicName', 'oevm.com.squareup.okhttp3'
+ optionalImport 'android.net.*'
+ optionalImport 'android.os'
+ optionalImport 'android.security'
+ optionalImport 'android.util'
+ optionalImport 'com.android.org.conscrypt'
+ optionalImport 'dalvik.system'
+ optionalImport 'javax.annotation'
+ optionalImport 'javax.net.*'
+ optionalImport 'javax.security.auth.x500'
+ optionalImport 'org.apache.harmony.xnet.provider.jsse'
+ optionalImport 'sun.security.ssl'
+ }
+ }
}
+
+apply plugin: 'java'
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ testImplementation 'org.eclipse.platform:org.eclipse.osgi'
+ testImplementation 'org.glassfish.hk2.external:javax.inject'
+
+ testImplementation 'org.ops4j.pax.exam:pax-exam-junit4'
+ testImplementation 'org.ops4j.pax.exam:pax-exam-container-native'
+ testImplementation 'org.ops4j.pax.exam:pax-exam-link-mvn'
+ testImplementation 'org.ops4j.pax.url:pax-url-aether'
+}
+
+test.dependsOn(tasks['bundles'])
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
new file mode 100644
index 0000000..6089219
--- /dev/null
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
@@ -0,0 +1,146 @@
+package org.eclipse.virgo.ebr;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.internal.SelfDescribingValue;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.options.DefaultCompositeOption;
+import org.ops4j.pax.exam.options.UrlProvisionOption;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+import javax.inject.Inject;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeNotNull;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
+import static org.osgi.framework.Bundle.ACTIVE;
+
+/**
+ * Abstract test class to be extended by all test implementations.
+ * <p>
+ * Created by dam on 6/14/17.
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public abstract class AbstractBaseTest {
+
+ private static final String SF_VERSION_KEY = "springframeworkVersion";
+
+ private static final String ASPECTJ_WEAVER_VERSION_KEY = "aspectjVersion";
+ private static final String JAVAX_SERVLET_VERSION_KEY = "javaxServletVersion";
+ private static final String JAVAX_EL_VERSION_KEY = "javaxServletVersion";
+ private static final String JAVAX_SEVLET_JSP_VERSION_KEY = "javaxServletVersion";
+
+ @Inject
+ private BundleContext bundleContext;
+
+ public static UrlProvisionOption springframework(String module) {
+ return getUrlProvisionOption("oevm.org.springframework." + module, SF_VERSION_KEY);
+ }
+
+ public abstract Option[] config();
+
+ void assertMirroredBundleActive(String baseBundleName) {
+ assertBundleActive("oevm." + baseBundleName);
+ }
+
+ void assertBundleActive(String symbolicName) {
+ assumeNotNull(symbolicName);
+ assumeFalse(symbolicName.isEmpty());
+ for (Bundle b : this.bundleContext.getBundles()) {
+ if (symbolicName.equals(b.getSymbolicName())) {
+ if (ACTIVE != b.getState()) {
+ try {
+ b.start(); // start the bundle so we get the exception
+ } catch (BundleException e) {
+ e.printStackTrace();
+ fail("Failed to start bundle");
+ }
+ }
+ return;
+ }
+ }
+ fail("Bundle with symbolicName [" + symbolicName + "] could not be found.");
+ }
+
+ static String resolveVersionFromGradleProperties(String libraryName) {
+ String versionString = "unresolved";
+ String gradlePropertiesFile = "../gradle.properties";
+ try {
+ Properties gradleProperties = new Properties();
+ gradleProperties.load(new FileInputStream(gradlePropertiesFile));
+ if (!gradleProperties.containsKey(libraryName)) {
+ fail("Couldn't resolve '" + libraryName + "' in '" + gradlePropertiesFile + "'.");
+ }
+ return gradleProperties.getProperty(libraryName);
+ } catch (IOException e) {
+ fail("Failed to load '" + gradlePropertiesFile + " ' to get version for '" + libraryName + "'.");
+ }
+ return versionString;
+ }
+
+ static UrlProvisionOption getUrlProvisionOption(String bundleName, String key) {
+ assertThat(Paths.get("build"), exists());
+ assertThat(Paths.get("build", "plugins"), exists());
+ String filename = bundleName + "_" + resolveVersionFromGradleProperties(key) + ".jar";
+ Path bundlePath = Paths.get("build", "plugins", filename);
+ assertThat(bundlePath, exists());
+
+ try {
+ return streamBundle(new FileInputStream(bundlePath.toFile()));
+ } catch (FileNotFoundException e) {
+ throw new IllegalStateException("Failed to load test bundle", e);
+ }
+ }
+
+ private static Matcher<Path> exists() {
+ return new PathExistsMatcher();
+ }
+
+ private static class PathExistsMatcher extends BaseMatcher<Path> {
+ @Override
+ public boolean matches(Object actual) {
+ if (actual instanceof Path) {
+ return ((Path) actual).toFile().exists();
+ }
+ return false;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendDescriptionOf(new SelfDescribingValue<>("Path didn't exist."));
+ }
+ }
+
+ Option aspectJWeaver() {
+ return getUrlProvisionOption("oevm.org.aspectj.weaver", ASPECTJ_WEAVER_VERSION_KEY);
+ }
+
+ Option servletDependencies() {
+ return new DefaultCompositeOption(
+ // TODO - switch to shared version
+// mavenBundle("javax.servlet", "javax.servlet-api", resolveVersionFromGradleProperties(JAVAX_SERVLET_VERSION_KEY)),
+ mavenBundle("javax.servlet", "javax.servlet-api", "3.1.0"),
+ mavenBundle("javax.el", "javax.el-api", "3.0.1-b06"),
+ mavenBundle("javax.servlet.jsp", "javax.servlet.jsp-api", "2.3.3"),
+ mavenBundle("javax.servlet.jsp.jstl", "javax.servlet.jsp.jstl-api", "1.2.2")
+ );
+ }
+
+}
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java
new file mode 100644
index 0000000..bbea508
--- /dev/null
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java
@@ -0,0 +1,50 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+public class GeminiBlueprint3Test extends AbstractBaseTest {
+
+ private static final String GEMINI_BLUEPRINT_VERSION = "3.0.0.M01";
+
+ @Configuration
+ @Override
+ public Option[] config() {
+ return options(
+ // spring framework dependencies
+ aspectJWeaver(),
+ servletDependencies(),
+
+ springframework("core"),
+ springframework("beans"),
+ springframework("aop"),
+ springframework("expression"),
+ springframework("context"),
+
+ mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-io", GEMINI_BLUEPRINT_VERSION),
+ mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-core", GEMINI_BLUEPRINT_VERSION),
+ mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-extender", GEMINI_BLUEPRINT_VERSION),
+
+ // specify junit bundles
+ junitBundles()
+ );
+ }
+
+ @Test
+ public void testGeminiBlueprintIo() {
+ assertBundleActive("org.eclipse.gemini.blueprint.io");
+ }
+
+ @Test
+ public void testGeminiBlueprintCore() {
+ assertBundleActive("org.eclipse.gemini.blueprint.core");
+ }
+
+ @Test
+ public void testGeminiBlueprintExtender() {
+ assertBundleActive("org.eclipse.gemini.blueprint.extender");
+ }
+}
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java
new file mode 100644
index 0000000..e0e003e
--- /dev/null
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java
@@ -0,0 +1,42 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+@Ignore("TODO - reactivate when switching to bundles from Maven Central")
+public class GogoShellTest extends AbstractBaseTest {
+
+ private static final String FELIX = "org.apache.felix";
+
+ private static final String RUNTIME = "org.apache.felix.gogo.runtime";
+ private static final String RUNTIME_VERSION_KEY = "gogoRuntimeVersion";
+
+ private static final String SHELL = "org.apache.felix.gogo.shell";
+ private static final String SHELL_VERSION_KEY = "gogoShellVersion";
+
+ @Configuration
+ @Override
+ public Option[] config() {
+ return options(
+ // maven local
+ mavenBundle(FELIX, RUNTIME, resolveVersionFromGradleProperties(RUNTIME_VERSION_KEY)),
+ mavenBundle(FELIX, SHELL, resolveVersionFromGradleProperties(SHELL_VERSION_KEY)),
+ // specify junit bundles
+ junitBundles()
+ );
+ }
+
+ @Test
+ public void testGogoRuntime() {
+ assertBundleActive(RUNTIME);
+ }
+
+ @Test
+ public void testGogoShell() {
+ assertBundleActive(SHELL);
+ }
+}
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
new file mode 100644
index 0000000..e740dda
--- /dev/null
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
@@ -0,0 +1,54 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.options.UrlProvisionOption;
+
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+/**
+ * Test class testing OkHttp3 bundle resolution.
+ * <p>
+ * Created by dam on 6/14/17.
+ */
+public class OkHttp3Test extends AbstractBaseTest {
+
+ private static final String OKIO = "com.squareup.okio";
+ private static final String OKIO_VERSION_KEY = "okioVersion";
+
+ private static final String OKHTTP3 = "com.squareup.okhttp3";
+ private static final String OKHTTP3_VERSION_KEY = "okhttp3Version";
+
+ @Configuration
+ @Override
+ public Option[] config() {
+ return options(
+ // 3rd-party local
+ okio(),
+ okhttp3(),
+ // specify junit bundles
+ junitBundles()
+ );
+ }
+
+ public static UrlProvisionOption okio() {
+ return getUrlProvisionOption("oevm.com.squareup.okio", OKIO_VERSION_KEY);
+ }
+
+ public static UrlProvisionOption okhttp3() {
+ return getUrlProvisionOption("oevm.com.squareup.okhttp3", OKHTTP3_VERSION_KEY);
+ }
+
+ @Test
+ public void testOkio() {
+ assertMirroredBundleActive(OKIO);
+ }
+
+ @Test
+ public void testOkHttp3() {
+ assertMirroredBundleActive(OKHTTP3);
+ }
+
+}
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
new file mode 100644
index 0000000..809feed
--- /dev/null
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
@@ -0,0 +1,143 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+/**
+ * Test class testing Spring Framework bundle resolution.
+ * <p>
+ * Created by dam on 6/9/17.
+ */
+public class SpringFrameworkTest extends AbstractBaseTest {
+
+ private static final String SF_PREFIX = "org.springframework.";
+
+ @Configuration
+ @Override
+ public Option[] config() {
+ return options(
+ // spring framework dependencies
+ aspectJWeaver(),
+ servletDependencies(),
+
+ springframework("core"),
+ springframework("beans"),
+ springframework("aop"),
+ springframework("aspects"),
+ springframework("expression"),
+ springframework("context"),
+ springframework("context.support"),
+ springframework("transaction"),
+ springframework("jcl"),
+ springframework("jdbc"),
+ springframework("messaging"),
+ springframework("jms"),
+ springframework("orm"),
+ springframework("oxm"),
+ springframework("web"),
+ springframework("webflux"),
+ springframework("webmvc"),
+ springframework("websocket"),
+ // specify junit bundles
+ junitBundles()
+ );
+ }
+
+ @Test
+ public void testSpringCore() {
+ assertMirroredSpringframeworkBundleActive("core");
+ }
+
+ @Test
+ public void testSpringBeans() {
+ assertMirroredSpringframeworkBundleActive("beans");
+ }
+
+ @Test
+ public void testSpringExpression() {
+ assertMirroredSpringframeworkBundleActive("expression");
+ }
+
+ @Test
+ public void testSpringAop() {
+ assertMirroredSpringframeworkBundleActive("aop");
+ }
+
+ @Test
+ public void testSpringAspects() {
+ assertMirroredSpringframeworkBundleActive("aspects");
+ }
+
+ @Test
+ public void testSpringContext() {
+ assertMirroredSpringframeworkBundleActive("context");
+ }
+
+ @Test
+ public void testSpringContextSupport() {
+ assertMirroredSpringframeworkBundleActive("context.support");
+ }
+
+ @Test
+ public void testSpringTransaction() {
+ assertMirroredSpringframeworkBundleActive("transaction");
+ }
+
+ @Test
+ public void testSpringJcl() {
+ assertMirroredSpringframeworkBundleActive("jcl");
+ }
+
+ @Test
+ public void testSpringJdbc() {
+ assertMirroredSpringframeworkBundleActive("jdbc");
+ }
+
+ @Test
+ public void testSpringMessaging() {
+ assertMirroredSpringframeworkBundleActive("messaging");
+ }
+
+ @Test
+ public void testSpringJms() {
+ assertMirroredSpringframeworkBundleActive("jms");
+ }
+
+ @Test
+ public void testSpringOrm() {
+ assertMirroredSpringframeworkBundleActive("orm");
+ }
+
+ @Test
+ public void testSpringOxm() {
+ assertMirroredSpringframeworkBundleActive("oxm");
+ }
+
+ @Test
+ public void testSpringWeb() {
+ assertMirroredSpringframeworkBundleActive("web");
+ }
+
+ @Test
+ public void testSpringWebflux() {
+ assertMirroredSpringframeworkBundleActive("webflux");
+ }
+
+ @Test
+ public void testSpringWebMvc() {
+ assertMirroredSpringframeworkBundleActive("webmvc");
+ }
+
+ @Test
+ public void testSpringWebsocket() {
+ assertMirroredSpringframeworkBundleActive("websocket");
+ }
+
+ private void assertMirroredSpringframeworkBundleActive(String module) {
+ assertMirroredBundleActive(SF_PREFIX + module);
+ }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.web/build.gradle b/apps/org.eclipse.virgo.apps.repository.web/build.gradle
index be94daf..964ebee 100644
--- a/apps/org.eclipse.virgo.apps.repository.web/build.gradle
+++ b/apps/org.eclipse.virgo.apps.repository.web/build.gradle
@@ -5,14 +5,14 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-beans'
+ implementation 'org.springframework:spring-context'
+ implementation 'org.springframework:spring-core'
+ implementation 'org.springframework:spring-web'
implementation project(':util:org.eclipse.virgo.util.io')
implementation project(':apps:org.eclipse.virgo.apps.repository.core')
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion, ext: "jar"
+ testImplementation 'org.springframework:spring-test'
}
diff --git a/build.gradle b/build.gradle
index 9845337..f040a09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -412,8 +412,7 @@
dependencies {
ecj group: "org.eclipse.jdt.core.compiler", name: "ecj", version: ecjVersion
- testCompile group: 'junit', name: 'junit', version: junitVersion, configuration: "compile", ext: "jar"
- testRuntime group: 'org.eclipse.virgo.mirrored', name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
+ testImplementation 'junit:junit'
}
eclipse {
@@ -516,26 +515,11 @@
// }
//}
-configure(javaProjects + osgiProjects + packagingProjects + project(":org.eclipse.virgo.site")) {
- repositories {
- mavenCentral()
- ivy {
- url "http://build.eclipse.org/rt/virgo/ivy/bundles/release/"
- layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
- }
- ivy {
- url "http://build.eclipse.org/rt/virgo/ivy/bundles/milestone/"
- layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
- }
- }
-}
-
-configure(project("3rd-party")) {
+configure(javaProjects + osgiProjects + packagingProjects + project(":org.eclipse.virgo.site") + project("3rd-party")) {
apply plugin: "io.spring.dependency-management"
repositories {
mavenCentral()
-
// Gemini Web and Tomcat dependencies aren't at Maven Central
ivy {
url "https://build.eclipse.org/rt/virgo/ivy/bundles/release/"
@@ -545,12 +529,70 @@
dependencyManagement {
dependencies {
+ // Equinox OSGi runtime
+ dependency "org.eclipse.platform:org.eclipse.osgi:3.11.2"
+
+ dependency "org.apache.felix:org.apache.felix.gogo.command:${gogoCommandVersion}"
+ dependency "org.apache.felix:org.apache.felix.gogo.runtime:${gogoRuntimeVersion}"
+ dependency "org.apache.felix:org.apache.felix.gogo.shell:${gogoShellVersion}"
+
// 3rd party dependencies
- dependency "org.apache.httpcomponents:httpcore:${httpcomponentsCoreVersion}"
- dependency "org.apache.httpcomponents:httpclient:${httpcomponentsClientVersion}"
+ dependency "org.glassfish.hk2.external:javax.inject:${glassfishJavaxInjectVersion}"
+ dependencySet(group:'org.slf4j', version: slf4jVersion) {
+ entry 'jcl-over-slf4j'
+ entry 'jul-to-slf4j'
+ entry 'slf4j-api'
+ entry 'slf4j-nop'
+ }
+ dependencySet(group:'ch.qos.logback', version: logbackVersion) {
+ entry 'logback-core'
+ entry 'logback-classic'
+ }
+
+ dependency "commons-codec:commons-codec:${commonsCodecVersion}"
+ dependency "commons-cli:commons-cli:${commonsCliVersion}"
+
+ dependency "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
+ dependency "org.apache.httpcomponents:httpclient:${httpclientVersion}"
+
+ dependency "org.hibernate:hibernate-core:${hibernateCoreVersion}"
+
+ // Spring dependencies
+ dependency "aopalliance:aopalliance:${aopallianceVersionMaven}"
+ dependency "org.aspectj:aspectjweaver:${aspectjVersion}"
+
+ dependencySet(group:'org.springframework', version: springframeworkVersion) {
+ entry 'spring-aspects'
+ entry 'spring-aop'
+ entry 'spring-beans'
+ entry 'spring-context'
+ entry 'spring-context-support'
+ entry 'spring-core'
+ entry 'spring-expression'
+ entry 'spring-jdbc'
+ entry 'spring-messaging'
+ entry 'spring-jms'
+ entry 'spring-orm'
+ entry 'spring-oxm'
+ entry 'spring-tx'
+ entry 'spring-web'
+ entry 'spring-webflux'
+ entry 'spring-webmvc'
+ entry 'spring-websocket'
+
+ entry 'spring-test'
+ }
+
+ dependency "com.squareup.okio:okio:${okioVersion}"
+ dependency "com.squareup.okhttp3:okhttp:${okhttp3Version}"
// testing
- dependency 'junit:junit:4.12' // CQ4129 (PB CQ3480) 4.7
+ dependency "junit:junit:${junitVersion}"
+
+ dependency "org.ops4j.pax.exam:pax-exam-junit4:${paxExamJunit4Version}"
+ dependency "org.ops4j.pax.exam:pax-exam-container-native:${paxExamContainerNativeVersion}"
+ dependency "org.ops4j.pax.exam:pax-exam-link-mvn:${paxExamLinkMvnVersion}"
+ dependency "org.ops4j.pax.url:pax-url-aether:${paxUrlAetherVersion}"
}
}
}
@@ -576,7 +618,15 @@
if (System.properties['ci.build'] == 'true' || System.properties['include.jacoco'] == 'true') {
apply plugin: "jacoco"
- jacoco { toolVersion = "0.8.1" }
+ jacoco {
+ toolVersion = "0.8.5"
+ }
+
+ test {
+ jacoco {
+ excludes = [ 'aspectj.*' ]
+ }
+ }
}
}
@@ -693,7 +743,7 @@
// OSGi runtime
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
+ testImplementation 'org.glassfish.hk2.external:javax.inject'
// PaxExam
testRuntime group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 8bad1f0..129a80f 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'maven'
apply plugin: 'groovy'
dependencies {
diff --git a/buildSrc/src/main/groovy/docbook/Docbook.groovy b/buildSrc/src/main/groovy/docbook/Docbook.groovy
deleted file mode 100644
index 54000d2..0000000
--- a/buildSrc/src/main/groovy/docbook/Docbook.groovy
+++ /dev/null
@@ -1,269 +0,0 @@
-package docbook
-//
-//import org.apache.fop.apps.Fop
-//import org.apache.fop.apps.FopFactory
-//import org.apache.fop.apps.MimeConstants
-//
-//import java.io.File
-//
-//import javax.xml.parsers.SAXParserFactory
-//import javax.xml.transform.Result
-//import javax.xml.transform.Source
-//import javax.xml.transform.Transformer
-//import javax.xml.transform.TransformerFactory
-//import javax.xml.transform.sax.SAXSource
-//import javax.xml.transform.sax.SAXResult
-//import javax.xml.transform.stream.StreamResult
-//import javax.xml.transform.stream.StreamSource
-//
-//import org.apache.tools.ant.filters.ReplaceTokens
-//import org.apache.xml.resolver.CatalogManager
-//import org.apache.xml.resolver.tools.CatalogResolver
-//import org.gradle.api.DefaultTask
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-//import org.gradle.api.tasks.OutputDirectory
-//import org.gradle.api.tasks.TaskAction
-//import org.xml.sax.InputSource
-//import org.xml.sax.XMLReader
-//
-//import com.icl.saxon.TransformerFactoryImpl
-//
-class Docbook implements Plugin<Project> {
-
- public void apply(Project project) {
-// project.extensions.create("docbook", DocbookExtension)
-// project.docbook.with {
-// }
-//
-// project.plugins.apply('base')
-//
-// project.configurations { docbook }
-//
-// project.repositories.mavenCentral()
-//
-// project.dependencies {
-// docbook 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
-// docbook 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
-// }
-//
-// def tasks = project.tasks
-//
-// def prepareDocbookResources = tasks.create("prepareDocbookResources", PrepareDocbookResources)
-// def prepareDocSources = tasks.create("prepareDocSources", PrepareDocSources)
-// prepareDocSources.dependsOn([prepareDocbookResources])
-//
-// def single = tasks.create("referenceHtmlSingle", DocbookReferenceTask)
-// single.dependsOn([prepareDocSources])
-// single.description('Generates single-page HTML documentation.')
-// single.customStylesheetLocation = "html/custom.xsl"
-// single.outputFormat = 'html-single'
-// single.extension = 'html'
-//
-// def multi = tasks.create("referenceHtmlMulti", DocbookReferenceTask)
-// multi.dependsOn([prepareDocSources])
-// multi.description('Generates multi-page HTML documentation.')
-// multi.customStylesheetLocation = "html-multi/custom.xsl"
-// multi.outputFormat = 'html-multi'
-// multi.extension = 'html'
-//
-// def fo = tasks.create("referenceFo", DocbookReferenceTask)
-// fo.dependsOn([prepareDocSources])
-// fo.description('Generates FO intermediate documentation.')
-// fo.customStylesheetLocation = "fo/custom.xsl"
-// fo.outputFormat = 'pdf'
-// fo.extension = 'fo'
-//
-// def pdf = tasks.create("referencePdf", FopTask)
-// pdf.dependsOn([fo])
-// pdf.description('Generates PDF documentation.')
-//
-// def reference = tasks.create("reference") {
-// group = 'Documentation'
-// description = "Generates HTML and PDF reference documentation."
-// dependsOn([single, multi, pdf])
-// outputs.dir new File(project.buildDir, "reference")
-// }
- }
-}
-//
-//class PrepareDocbookResources extends DefaultTask {
-//
-// @OutputDirectory
-// File outputDir = new File(project.getBuildDir(), "docbook")
-//
-// @TaskAction
-// public final void prepareDocbookResources() {
-// File docbookZip = project.configurations.docbook.files.find { File file -> file.name.contains('docbook-xsl-')};
-//
-// project.copy {
-// from project.zipTree(docbookZip)
-// include 'docbook/**'
-// into project.getBuildDir()
-// }
-// }
-//}
-//
-//class PrepareDocSources extends DefaultTask {
-//
-// @OutputDirectory
-// File outputDir = new File(project.getBuildDir(), "work")
-//
-// @TaskAction
-// public final void prepareDocSources() {
-// def version = project.docbook.version
-// def tokenMap = [
-// 'project.name': 'Virgo',
-// 'runtime.category': 'EclipseRT',
-// 'umbrella.product.name': 'Virgo Runtime Environment',
-// 'umbrella.product.name.short': 'Virgo Runtime',
-// 'tomcat.product.name': 'Virgo Server for Apache Tomcat',
-// 'tomcat.product.name.short': 'VTS',
-// 'jetty.product.name': 'Virgo Jetty Server',
-// 'jetty.product.name.short': 'VJS',
-// 'kernel.product.name': 'Virgo Kernel',
-// 'kernel.product.name.short': 'VK',
-// 'nano.product.name': 'Virgo Nano',
-// 'nano.product.name.short': 'VN',
-// 'nanoweb.product.name': 'Virgo Nano Web',
-// 'snaps.product.name': 'Virgo Snaps',
-// 'snaps.product.name.short': 'VS',
-// 'ebr': 'SpringSource Enterprise Bundle Repository',
-// 'p2repo': "http://download.eclipse.org/virgo/updatesite/${version}".toString(),
-// 'bundle.version': "${version}".toString(),
-// ]
-//
-// project.copy {
-// from project.file(project.docbook.docSourceDirName)
-// into outputDir
-// filter(ReplaceTokens, tokens: tokenMap)
-// }
-// // copy DocBook images and...
-// project.copy {
-// from "${project.buildDir}/docbook/images"
-// into new File(outputDir, 'images')
-// }
-// // project images.
-// project.copy {
-// from project.file(project.docbook.imageSourceDirName)
-// into new File(outputDir, 'images')
-// }
-// }
-//}
-//
-//class DocbookReferenceTask extends DefaultTask {
-//
-// File inputDir
-//
-// File outputDir
-//
-// String customStylesheetLocation
-//
-// String outputFormat
-//
-// String extension
-//
-// @OutputDirectory
-// File outputBaseDir = new File(project.getBuildDir(), "reference")
-//
-// @TaskAction
-// public final void transform() {
-// inputDir = new File(project.buildDir, 'work')
-// outputDir = new File(outputBaseDir, outputFormat)
-//
-// SAXParserFactory factory = new org.apache.xerces.jaxp.SAXParserFactoryImpl()
-// factory.setXIncludeAware(true)
-//
-// CatalogResolver resolver = new CatalogResolver(createCatalogManager())
-//
-// TransformerFactory transformerFactory = new TransformerFactoryImpl()
-// transformerFactory.setURIResolver(resolver)
-//
-// File stylesheetFile = new File(inputDir, "styles/${customStylesheetLocation}")
-// URL url = stylesheetFile.toURI().toURL()
-//
-// Transformer transformer = transformerFactory.newTransformer(new StreamSource(url.openStream(), url.toExternalForm()))
-// transformer.setParameter("highlight.source", "1")
-// transformer.setParameter("highlight.xslthl.config", new File("${project.buildDir}/docbook/highlighting", "xslthl-config.xml").toURI().toURL())
-// transformer.setParameter("root.filename", project.docbook.baseName)
-// transformer.setParameter("base.dir", outputDir)
-//
-// File inputFile = new File(inputDir, "${project.docbook.baseName}.xml")
-// File outputFile = new File(outputDir, "${project.docbook.baseName}.${extension}")
-//
-// XMLReader reader = factory.newSAXParser().getXMLReader()
-// reader.setEntityResolver(resolver)
-//
-// transformer.transform(new SAXSource(reader, new InputSource(inputFile.getAbsolutePath())), new StreamResult(outputFile.getAbsolutePath()))
-//
-// project.copy {
-// from "${inputDir}/images"
-// into new File(outputDir, "images")
-// }
-// project.copy {
-// from "${inputDir}/css"
-// into new File(outputDir, "css")
-// }
-// }
-//
-// private CatalogManager createCatalogManager() {
-// CatalogManager manager = new CatalogManager()
-// manager.setIgnoreMissingProperties(true)
-// ClassLoader classLoader = this.getClass().getClassLoader()
-// URL docbookCatalog = classLoader.getResource("docbook/catalog.xml")
-// manager.setCatalogFiles(docbookCatalog.toExternalForm())
-// return manager
-// }
-//}
-//
-//class FopTask extends DefaultTask {
-//
-// File inputDir = new File(project.getBuildDir(), "reference/pdf")
-//
-// @TaskAction
-// public final void foToPdf() {
-// File foFile = new File(project.getBuildDir(), "reference/pdf/${project.docbook.baseName}.fo")
-//
-// project.copy {
-// from new File(project.buildDir, "work/images")
-// into new File(inputDir, 'images')
-// }
-//
-// FopFactory fopFactory = FopFactory.newInstance()
-// fopFactory.setBaseURL(inputDir.toURI().toURL().toExternalForm())
-//
-// final File pdfFile = new File(foFile.parent, "${project.docbook.baseName}.pdf")
-//
-// logger.debug("Transforming 'fo' file " + foFile + " to PDF: " + pdfFile)
-//
-// OutputStream out = null
-// try {
-// out = new BufferedOutputStream(new FileOutputStream(pdfFile))
-//
-// Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out)
-//
-// TransformerFactory factory = TransformerFactory.newInstance()
-// Transformer transformer = factory.newTransformer()
-//
-// Source src = new StreamSource(foFile)
-// src.setSystemId(foFile.toURI().toURL().toExternalForm())
-//
-// Result res = new SAXResult(fop.getDefaultHandler())
-// transformer.transform(src, res)
-// } finally {
-// if (out != null) {
-// out.close()
-// }
-// }
-//
-// if (!foFile.delete()) {
-// logger.warn("Failed to delete temporary 'fo' file " + foFile)
-// }
-// if (!project.delete(new File(inputDir, 'images'))) {
-// logger.warn("Failed to delete 'images' path " + new File(inputDir, 'images'))
-// }
-// if (!project.delete(new File(inputDir, 'css'))) {
-// logger.warn("Failed to delete 'css' path " + new File(inputDir, 'css'))
-// }
-// }
-//}
diff --git a/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy b/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy
deleted file mode 100644
index b2008db..0000000
--- a/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy
+++ /dev/null
@@ -1,10 +0,0 @@
-//package docbook
-//
-//class DocbookExtension {
-//
-// String baseName = 'index'
-// String docSourceDirName = 'src/docs/docbook'
-// String imageSourceDirName = 'src/docs/images'
-//
-// String version = 'undefined_doc_version'
-//}
diff --git a/ebr/README.md b/ebr/README.md
deleted file mode 100644
index fa19611..0000000
--- a/ebr/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Publishing 3rd party bundles
-
-We use our JIPP instance to publish 3rd party bundles.
-The job [virgo-mirrored-master](https://ci.eclipse.org/virgo/view/Virgo/job/virgo-mirrored-master/) publishes the artifacts created with subproject `ebr`.
-
-## Building
-
-Gradle default tasks:
- 1. `clean` - Cleans old build output
- 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)
-
-Build and test locally:
-
- `./gradlew clean bundlor publishToMavenLocal test`
-
-## Update Version of a Spring Framework stream
-
-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)
-
-* Rename the directories to the new version of Spring.
-* Check and update the versions of the dependencies in `gradle.properties`, if required.
-
-## Add a new Spring Framework stream
-
-* Create new folder structure e.g. `5.1.<version>`
diff --git a/ebr/build.gradle b/ebr/build.gradle
index a1b2bdc..84c5583 100644
--- a/ebr/build.gradle
+++ b/ebr/build.gradle
@@ -1,113 +1,3 @@
-buildscript {
- repositories { mavenCentral() }
- dependencies {
- classpath 'org.apache.ivy:ivy:2.4.0'
- }
-}
-
-defaultTasks 'clean', 'bundlor', 'publishToMavenLocal', 'test', 'publishIvyPublicationToIvyRepository'
-
-apply plugin: 'java'
-
-allprojects {
- apply plugin: 'java'
-
- repositories {
- mavenCentral()
- maven {
- url "http://build.eclipse.org/rt/virgo/gradle/bundles"
- }
- ivy {
- url "http://build.eclipse.org/rt/virgo/ivy/bundles/release/"
- layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
- }
- }
-}
-
-subprojects {
- apply plugin: 'ivy-publish'
- apply plugin: 'maven-publish'
-
- configurations {
- bundlorRuntime
- sourceBundle
- }
-
- dependencies {
- bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor.commandline:1.1.3.M01')
- bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor:1.1.3.M01')
- bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor.blint:1.1.3.M01')
- }
-
- task createBuildDir() {
- doLast() {
- file(project.buildDir).mkdir()
- }
- }
-
- task('addProjectVersionToGradlePropertiesTask', type: Copy) {
- ext.outputDir = new File(buildDir, 'bundlor-properties')
- inputs.file project.rootProject.file('gradle.properties')
- outputs.dir ext.outputDir
- from project.rootProject.file('gradle.properties')
- into ext.outputDir
- }
-
- def artifactName = project.name.split('-')[0]
- def artifactVersion = project.name.split('-')[1]
-
- def outputFile = new File(file(project.buildDir), "${project.name}.jar")
-
- def propertiesPath = new File(file(project.buildDir), "bundlor-properties/gradle.properties")
-
- task bundlor(type: JavaExec, dependsOn: [createBuildDir, 'addProjectVersionToGradlePropertiesTask']) {
-
- classpath = configurations.bundlorRuntime
-
- main = 'org.eclipse.virgo.bundlor.commandline.Bundlor'
- args '-r', propertiesPath
- args '-D', "springframeworkVersion=${springframeworkVersion}"
- args '-i', "${-> configurations.sourceBundle[0]}" // lazy GString to resolve the configuration at runtime
- args '-m', "${artifactName}.mf"
- args '-o', outputFile
- args '-f'
- }
-
- publishing {
- publications {
- ivy(IvyPublication) {
- organisation 'org.eclipse.virgo.mirrored'
- module "${artifactName}"
- revision "${artifactVersion}"
- artifact(outputFile)
- }
- maven(MavenPublication) {
- groupId 'org.eclipse.virgo.mirrored'
- artifactId "${artifactName}"
- version "${artifactVersion}"
- artifact(outputFile)
- }
- }
- repositories {
- ivy {
- url "/opt/public/rt/virgo/ivy/bundles/release"
- }
- }
- }
-}
-
-dependencies {
- testCompile "junit:junit:${junitVersion}"
- testCompile "org.ops4j.pax.exam:pax-exam-junit4:$paxExamJunit4Version"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
- testRuntime "org.ops4j.pax.exam:pax-exam-container-native:$paxExamContainerNativeVersion"
- testRuntime "org.ops4j.pax.exam:pax-exam-link-mvn:$paxExamLinkMvnVersion"
- testRuntime "org.ops4j.pax.url:pax-url-aether:$paxUrlAetherVersion"
-}
-
-task wrapper(type: Wrapper) {
- description 'Creates a local Gradle Wrapper'
- group = 'Build Setup'
- gradleVersion = '3.5' // CQ 13634
+task bundlor {
+ println "Empty task to keep old Jenkins builds stable."
}
diff --git a/ebr/com.squareup.okhttp3-3.9.1/build.gradle b/ebr/com.squareup.okhttp3-3.9.1/build.gradle
deleted file mode 100644
index 7e7973f..0000000
--- a/ebr/com.squareup.okhttp3-3.9.1/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp3Version
-}
diff --git a/ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf b/ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf
deleted file mode 100644
index 0d222f9..0000000
--- a/ebr/com.squareup.okhttp3-3.9.1/com.squareup.okhttp3.mf
+++ /dev/null
@@ -1,19 +0,0 @@
-Bundle-SymbolicName: com.squareup.okhttp3
-Bundle-Name: OkHttp
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${okhttp3Version}
-Import-Template:
- okio;version="${okioVersion:[=.=.=, +1)}",
- android.os;version="0";resolution:="optional",
- android.util;version="0";resolution:="optional",
- javax.annotation;version="0";resolution:=optional,
- javax.net.*;version="0";resolution:=optional,
- javax.security.auth.x500;version="0";resolution:=optional
-Export-Template:
- okhttp3.*;version="${okhttp3Version}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/com.squareup.okio-1.14.0/build.gradle b/ebr/com.squareup.okio-1.14.0/build.gradle
deleted file mode 100644
index 9aabb53..0000000
--- a/ebr/com.squareup.okio-1.14.0/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'com.squareup.okio', name: 'okio', version: okioVersion
-}
diff --git a/ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf b/ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf
deleted file mode 100644
index b680615..0000000
--- a/ebr/com.squareup.okio-1.14.0/com.squareup.okio.mf
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-SymbolicName: com.squareup.okio
-Bundle-Name: Okio
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${okioVersion}
-Import-Template:
- javax.annotation;version="0";resolution:=optional,
- javax.crypto.*;version="0";resolution:=optional,
- org.codehaus.mojo.animal_sniffer;version="[1.15,2)";resolution:=optional
-Export-Template:
- okio.*;version="${okioVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/ebr.iml b/ebr/ebr.iml
deleted file mode 100644
index f4601dc..0000000
--- a/ebr/ebr.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ebr" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/.gradle" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/ebr/gradle.properties b/ebr/gradle.properties
deleted file mode 100644
index 1fde8d9..0000000
--- a/ebr/gradle.properties
+++ /dev/null
@@ -1,354 +0,0 @@
-# sftp server url
-ECLIPSE_ORG_FTP_HOST=build.eclipse.org
-# sftp username
-ECLIPSE_ORG_FTP_USER=virgoBuild
-# sftp key
-ECLIPSE_ORG_FTP_IDENTITY=id_virgoBuild_rsa
-# absolute path to the root of the update-sites mirror
-ECLIPSE_ORG_FTP_MIRROR_PATH=/shared/rt/virgo/ivy/bundles/release
-
-# CQ4129 (PB CQ3480)
-junitVersion = 4.7
-
-# CQ4132 (PB CQ1887)
-easymockVersion = 2.3
-
-# PaxExam
-# CQ8541
-paxExamJunit4Version = 4.11.0
-paxExamContainerNativeVersion = 4.11.0
-paxExamLinkMvnVersion = 4.11.0
-paxUrlAetherVersion = 2.5.2
-paxUrlWrapVersion = 2.3.0
-
-# CQ 12463 SLF4J jcl-over-slf4j Version: 1.7.22
-# CQ 12465 SLF4J jul-to-slf4j Version: 1.7.22
-# 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.25
-# CQ 12508 - Logback Classic Version 1.1.8
-# CQ 12507 - Logback Core Version: 1.1.8
-logbackVersion = 1.1.8
-
-# Eclipse Kepler 4.3.2 (SR2)
-equinoxVersion = 3.9.1.v20140110-1610
-osgiServicesVersion = 3.3.100.v20130513-1956
-osgiEnterpriseVersion = 4.2.0.v201108120515
-
-equinoxAppVersion = 1.3.100.v20130327-1442
-# ConfigAdminService
-equinoxCmVersion = 1.0.400.v20130327-1442
-# Eclipse Mars.2
-# requires 'package org.osgi.framework 1.8.0'
-# equinoxCmVersion = 1.1.0.v20131021-1936
-equinoxCommonVersion = 3.6.200.v20130402-1505
-# DeclarativeService
-equinoxDsVersion = 1.4.101.v20130813-1853
-equinoxConsoleVersion = 1.0.100.v20130429-0953
-equinoxConsoleSshVersion = 1.0.0.v20130515-2026
-equinoxEventVersion = 1.3.0.v20130327-1442
-equinoxFrameworkadminEquinoxVersion = 1.0.500.v20130327-2119
-equinoxFrameworkadminVersion = 2.0.100.v20130327-2119
-
-#equinoxHttpJettyVersion = 3.0.200.v20131021-1843
-equinoxHttpJettyVersion = 3.0.100.v20130327-1442
-#equinoxHttpServletVersion = 1.1.500.v20140318-1755
-equinoxHttpServletVersion = 1.1.400.v20130418-1354
-
-# Note: Used by Virgo Build Tools, too
-equinoxLauncherVersion = 1.3.0.v20130327-1440
-equinoxPreferencesVersion = 3.5.100.v20130422-1538
-equinoxRegionVersion = 1.1.101.v20130722-1314
-equinoxRegionExportedPackageVersion = 1.1.0
-equinoxRegistryVersion = 3.5.301.v20130717-1549
-equinoxSecurityVersion = 1.2.0.v20130424-1801
-equinoxSimpleConfiguratorVersion = 1.0.400.v20130327-2119
-equinoxSimpleConfiguratorManipulatorVersion = 2.0.0.v20130327-2119
-equinoxUtilVersion = 1.0.500.v20130404-1337
-
-eclipseCoreContenttypeVersion = 3.4.200.v20130326-1255
-eclipseCoreJobsVersion = 3.5.300.v20130429-1813
-eclipseCoreNetVersion = 1.2.200.v20130430-1352
-eclipseCoreRuntimeVersion = 3.9.100.v20131218-1515
-
-eclipseJdtCoreCompilerBatchVersion = 3.10.0.v20140604-1726
-
-eclipseEcfIdentityVersion = 3.2.0.v20130604-1622
-eclipseEcfFiletransferVersion = 5.0.0.v20130604-1622
-eclipseEcfProviderFiletransferVersion = 3.2.0.v20130604-1622
-eclipseEcfSslVersion = 1.1.0.v20130604-1622
-eclipseEcfVersion = 3.2.0.v20130604-1622
-
-sat4jCoreVersion = 2.3.5.v201308161310
-sat4jPbVersion = 2.3.5.v201308161310
-
-p2ArtifactRepositoryVersion = 1.1.200.v20130515-2028
-p2ConsoleVersion = 1.0.300.v20130327-2119
-p2CoreVersion = 2.3.0.v20130327-2119
-p2DirectorVersion = 2.3.1.v20140221-1852
-p2EngineVersion = 2.3.0.v20130526-2122
-p2GarbageCollectorVersion = 1.0.200.v20130327-2119
-p2JarProcessorVersion = 1.0.300.v20130327-2119
-p2MetadataVersion = 2.2.0.v20130523-1557
-p2MetadataRepositoryVersion = 1.2.100.v20130327-2119
-p2PublisherVersion = 1.3.0.v20140129-1405
-p2PublisherEclipseVersion = 1.1.200.v20130516-1953
-p2RepositoryVersion = 2.3.0.v20130412-2032
-p2TouchpointEclipseVersion = 2.1.200.v20130327-2119
-p2TouchpointNativesVersion = 1.1.100.v20130327-2119
-p2TransportEcfVersion = 1.1.0.v20130516-1858
-
-#CQ5528
-apacheSshdCoreVersion = 0.5.0.v201108120515
-#CQ6402 - command, shell and runtime
-gogoCommandVersion = 0.10.0.v201209301215
-gogoRuntimeVersion = 0.10.0.v201209301036
-gogoShellVersion = 0.10.0.v201211091412
-#CQ5527
-minaCoreVersion = 2.0.2.v201108120515
-
-orgAopAllianceVersion = 1.0.0
-
-geminiBlueprintVersion = 2.0.0.RELEASE
-// TODO update CQs for 5.0.8
-#CQ 13690 org.springframework.aop
-#CQ 13691 org.springframework.aspects
-#CQ 13692 org.springframework.beans
-#CQ 13693 org.springframework.context
-#CQ 13694 org.springframework.context.support
-#CQ 13695 org.springframework.core
-#CQ 13696 org.springframework.expression
-#CQ 13697 org.springframework.jdbc
-#CQ ?! org.springframework.jcl
-#CQ 13698 org.springframework.jms
-#CQ 13699 org.springframework.messaging
-#CQ 13700 org.springframework.orm
-#CQ 13701 org.springframework.oxm
-#CQ 13702 org.springframework.transaction
-#CQ 13703 org.springframework.web
-#CQ ?! org.springframework.webflux
-#CQ 13704 org.springframework.webmvc
-#CQ 13706 org.springframework.websocket
-springframeworkVersion = 5.0.8.RELEASE
-
-geminiManagementVersion = 1.0.5.RELEASE
-geminiWebVersion = 3.0.0.RC3
-
-objectwebAsmVersion = 3.2.0.v200909071300
-scannotationVersion = 1.0.2.v201205170710
-
-commonsBeanutilsVersion = 1.8.0.v201205091237
-# CQ 10288 (PB CQ9217)
-commonsCodecVersion = 1.10.0
-commonsCliVersion = 1.2.0
-# CQ12542 (PB CQ10386)
-commonsCollectionsVersion = 3.2.2
-commonsDbcpVersion = 1.4.0.v201204271417
-# CQ12541 (PB CQ12051) - version 1.3.2
-commonsFileuploadVersion = 1.3.3
-# CQ3956 (PB CQ1765)
-commonsHttpClientVersion = 3.1.0
-
-# CQ9555 (PB Orbit CQ8938)
-httpcomponentsCoreVersion = 4.3.3
-# CQ9556 (PB Orbit CQ8934)
-httpcomponentsClientVersion = 4.3.6
-
-# CQ11189 (PB Orbit CQ8294)
-commonsIoVersion = 2.2
-commonsLangVersion = 3.1.0
-# CQ pending PB CQ10162?
-commonsLoggingVersion = 1.2.0
-commonsPoolVersion = 1.6.0.v201204271246
-
-apacheTaglibsStandardVersion = 1.1.2.v20110517
-
-apacheBvalVersion = 0.5.0
-# CQ7162 OpenEJB (Subset) Version: 4.5.2
-apacheOpenejbVersion = 4.5.2
-apacheOpenejbCoreVersion = 4.5.2.virgo-3
-
-# CQ7145 openwebbeans (Subset) Version: 1.1.7
-apacheOpenwebbeansVersion = 1.1.7.v201304201405
-apacheOpenwebbeansEEVersion = 1.1.7.v201304200545
-apacheOpenwebbeansTomcat7Version = 1.1.7.v201304201405-virgo-1
-
-# CQ7149 XBean (Subset) Version: 3.12
-apacheXBeanAsmVersion = 3.12.0.v201304200545
-apacheXBeanBundleutilsVersion = 3.12.0.v201304200545
-apacheXBeanFinderVersion = 3.12.0.v201304201405
-apacheXBeanNamingVersion = 3.12.0.v201304201405
-apacheXBeanReflectVersion = 3.12.0.v201304201405
-
-# CQ7147 Java Server Faces Version: 2.1.18
-# TODO What's the difference of javax.faces and com.sun.faces - do we need both?
-glassfishJavaxFacesVersion = 2.1.18.v201304200545
-glassfishComSunFacesVersion = 2.1.18.v201304210537-virgo-2
-
-geronimoComponentsConnectorVersion = 3.1.1.v201205170953
-geronimoComponentsTransactionVersion = 3.1.1.v201205170710
-geronimoSpecsJ2eeManagementVersion = 1.0.0.v201205091237
-geronimoSpecsOsgiLocatorVersion = 1.1.0.v201205170953
-geronimoSpecsOsgiRegistryVersion = 1.1.0.v201205170710
-
-javaxActivationVersion = 1.1.0.v201108011116
-javaxAnnotationVersion= 1.2.0.v201401042248
-# CQ6093 ejb-api Version: 3.1.1
-javaxEjbVersion=3.1.1.v201204261316
-javaxElVersion=3.0.0.20180121
-# CQ6090 (PB Orbit CQ3578)
-javaxInjectVersion = 1.0.0.v20091030
-javaxJmsVersion=1.1.0.v201205091237
-# CQ12547 (PB CQ11275) - 1.5.5
-javaxMailVersion = 1.5.6
-# TODO create CQ?
-# Available from Eclipse Link p2 site http://download.eclipse.org/rt/eclipselink/updates/2.4.2.v20130514-5956486/
-javaxPersistenceVersion=2.1.0.v201304241213
-# CQ3940
-javaxPortletVersion=2.0.0
-javaxResourceVersion=1.6.0.v201204270900
-javaxSecurityAuthMessageVersion=1.1.0
-# TODO - check if a CQ is missing
-javaxSecurityJaccVersion=1.4.0.v201205031350
-# CQ6246 Jetty servlet-api Version: 3.0 (PB CQ3217)
-# TODO - update CQ?
-javaxServletVersion = 3.1.0.20150414
-javaxServletJspVersion = 2.3.0
-# CQ12544 javax.servlet.jsp.jstl api Version: 1.2.1
-javaxServletJspJstlApiVersion=1.2.1
-# CQ12543 JSP Standard Tag Library Version 1.2.5-b03
-javaxServletJspJstlImplVersion=1.2.5.b03
-# CQ12565 Java Interceptor API 1.2
-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)
-javaxValidationVersion=1.0.0.GA_v201205091237
-# Covered by Tomcat CQ
-javaxWebsocketVersion=1.1.0.v201401130840
-javaxWsdlVersion=1.6.2.v201012040545
-javaxWsRsVersion=1.1.1.v20101004-1200
-javaxXmlRpcVersion=1.1.0.v201005080400
-
-eclipsePersistenceAntlrVersion = 3.2.0.v201206041011
-eclipsePersistenceAsmVersion = 3.3.1.v201206041142
-# TODO update to 2.4.2 required by spring-orm
-eclipsePersistenceCoreVersion = 2.4.1.v20121003-ad44345
-eclipsePersistenceJpaVersion = 2.4.1.v20121003-ad44345
-eclipsePersistenceJpaJpqlVersion = 2.0.1.v20121003-ad44345
-
-# CQ6092 cdi-api Version: 1.0 (Context and Dependency Injection API from JSR 299)
-cdiApiVersion = 1.0.0.v201105160744
-javassistVersion = 3.17.1.GA
-# CQ6100 Java Open Transaction Manager (JOTM) 2.1.9 *Subset*
-jotmVersion = 2.1.9.v201204271116
-quartzVersion = 2.2.3
-
-# CQ11207
-jolokiaVersion = 1.3.3
-
-aspectjVersion = 1.8.10
-
-jettyVersion = 8.1.16.v20140903
-# TODO move forward to latest release (as of April 8th 2016)
-#jettyVersion = 8.1.18.v20150929
-
-# CQ9080 Apache Tomcat Version: 7.0.56 (PB Orbit CQ8933)
-#apacheCatalinaVersion = 7.0.56.v201412180755
-apacheCatalinaVersion = 8.5.5
-
-# CQ7699 (PB Orbit CQ6772)
-mozillaJavascriptVersion = 1.7.4.v201209142200
-# CQ7126 Hibernate Version: 4.1.0
-hibernateValidatorVersion = 4.3.2.Final
-hibernateVersion = 5.2.10.Final
-
-# performance-tests
-# jwebunitVersion = 2.2.0
-# TODO create CQ for version 3.2?
-jwebunitVersion = 3.2
-# TODO create CQ for version 2.15?
-htmlUnitVersion = 2.15
-
-# system-tests
-dumbsterVersion = 1.6.0
-
-# OSGi test
-# optional spring 4.2.9.RELEASE dependencies - used only to generate the correct OSGi manifests
-
-# spring-aop
-jamonVersion = 2.81
-commonsPool2Version = 2.4.2
-
-# spring-aspects
-javaxCacheVersion = 1.0.0
-
-# spring-beans
-# 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
-# bundlor fails with 2.0b4
-beanShellVersion = 2
-jodaTimeVersion = 2.9.9
-jrubyVersion = 1.7.27
-
-# spring-context-support
-commonjVersion = 1.1.0
-ehcacheVersion = 2.10.4
-freemarkerVersion = 2.3.23
-jasperreportsVersion = 6.2.1
-velocityVersion = 1.7
-benmanesCaffeineVersion = 2.3.5
-
-# spring-core
-# CQ4833 log4j Version: 1.2.15 (Subset - see all comments) (PB Orbit CQ3560)
-apacheLog4jVersion = 1.2.17
-joptSimpleVersion = 5.0.4
-nettyVersion = 4.1.21.Final
-reactorCoreVersion = 3.1.5.RELEASE
-reactiveStreamsVersion = 1.0.2
-rxJava2Version = 2.1.9
-rxJavaVersion = 1.3.6
-rxJavaReactiveStreamsVersion = 1.2.1
-
-# spring-jdbc
-h2Version = 1.4.193
-c3p0Version = 0.9.5.2
-hsqldbVersion = 2.3.4
-jacksonVersion = 2.8.11.1
-apacheDerbyVersion = 10.13.1.1
-
-# spring-messaging
-
-# spring-orm
-jdoApiVersion = 3.1
-openjpaVersion = 2.4.2
-
-# spring-oxm
-xstreamVersion = 1.4.9
-xmlBeans = 2.6.0
-castorVersion = 1.4.1
-jibxVersion = 1.2.6
-
-# spring-web
-hessianVersion = 4.0.38
-gsonVersion = 2.8.5
-protobufJavaVersion = 2.6.1
-protobufJavaFormatVersion = 1.4
-romeVersion = 1.7.4
-okhttp3Version = 3.9.1
-okioVersion = 1.14.0
-
-# spring-webmvc
-jxlVersion = 2.6.12
-poiVersion = 3.14
-# 0.32-1 is no valid OSGi qualifier
-webjarsVersion = 0.32
-
-# spring-websocket
-undertowVersion = 1.3.33.Final
diff --git a/ebr/gradle/wrapper/gradle-wrapper.jar b/ebr/gradle/wrapper/gradle-wrapper.jar
index 6ffa237..2a759d5 100644
--- a/ebr/gradle/wrapper/gradle-wrapper.jar
+++ b/ebr/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ebr/gradle/wrapper/gradle-wrapper.properties b/ebr/gradle/wrapper/gradle-wrapper.properties
index f17aa14..1df18a3 100644
--- a/ebr/gradle/wrapper/gradle-wrapper.properties
+++ b/ebr/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 09 15:10:16 CEST 2017
+#Sat Nov 02 08:39:51 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
diff --git a/ebr/gradlew b/ebr/gradlew
index 9aa616c..4453cce 100755
--- a/ebr/gradlew
+++ b/ebr/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -154,16 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/ebr/gradlew.bat b/ebr/gradlew.bat
index e95643d..f955316 100644
--- a/ebr/gradlew.bat
+++ b/ebr/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ebr/org.aspectj.weaver-1.8.10/build.gradle b/ebr/org.aspectj.weaver-1.8.10/build.gradle
deleted file mode 100644
index 89b906b..0000000
--- a/ebr/org.aspectj.weaver-1.8.10/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.aspectj', name: 'aspectjweaver', version: "${aspectjVersion}"
-}
diff --git a/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf b/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf
deleted file mode 100644
index a04e97a..0000000
--- a/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf
+++ /dev/null
@@ -1,22 +0,0 @@
-Name: org/aspectj/weaver/
-Specification-Title: AspectJ Weaver Classes
-Specification-Version: ${aspectjVersion}
-Specification-Vendor: aspectj.org
-Implementation-Title: org.aspectj.weaver
-Implementation-Version: ${aspectjVersion}
-Implementation-Vendor: aspectj.org
-Premain-Class: org.aspectj.weaver.loadtime.Agent
-Agent-Class: org.aspectj.weaver.loadtime.Agent
-Can-Redefine-Classes: true
-Bundle-SymbolicName: org.aspectj.weaver
-Bundle-Name: AspectJ weaver
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${aspectjVersion}
-Import-Template:
- com.bea.jvm;version="0";resolution:="optional",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}";resolution:="optional",
- javax.xml.parsers;version="0",
- org.xml.sax.*;version="0"
-Export-Template:
- org.aspectj.*;version="${aspectjVersion}"
diff --git a/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index e1a17da..0000000
--- a/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-aop', version: "${springframeworkVersion}"
-}
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.21.RELEASE/build.gradle b/ebr/org.springframework.aop-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index d6f2c81..0000000
--- a/ebr/org.springframework.aop-4.3.21.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.3.21.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-4.3.21.RELEASE/org.springframework.aop.mf
deleted file mode 100644
index d05ddc6..0000000
--- a/ebr/org.springframework.aop-4.3.21.RELEASE/org.springframework.aop.mf
+++ /dev/null
@@ -1,27 +0,0 @@
-Bundle-SymbolicName: org.springframework.aop
-Bundle-Name: Spring AOP
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- 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}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Export-Package,
- Import-Package,
- Tool
-
diff --git a/ebr/org.springframework.aop-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.aop-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index d6f2c81..0000000
--- a/ebr/org.springframework.aop-5.0.8.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-5.0.8.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-5.0.8.RELEASE/org.springframework.aop.mf
deleted file mode 100644
index d05ddc6..0000000
--- a/ebr/org.springframework.aop-5.0.8.RELEASE/org.springframework.aop.mf
+++ /dev/null
@@ -1,27 +0,0 @@
-Bundle-SymbolicName: org.springframework.aop
-Bundle-Name: Spring AOP
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- 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}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Export-Package,
- Import-Package,
- Tool
-
diff --git a/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 5520b71..0000000
--- a/ebr/org.springframework.aspects-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 5520b71..0000000
--- a/ebr/org.springframework.aspects-4.3.21.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.3.21.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-4.3.21.RELEASE/org.springframework.aspects.mf
deleted file mode 100644
index 132f4bb..0000000
--- a/ebr/org.springframework.aspects-4.3.21.RELEASE/org.springframework.aspects.mf
+++ /dev/null
@@ -1,30 +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,
- javax.transaction;version="${javaxTransactionVersion:[=.=, +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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.aspects-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 5520b71..0000000
--- a/ebr/org.springframework.aspects-5.0.8.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-5.0.8.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-5.0.8.RELEASE/org.springframework.aspects.mf
deleted file mode 100644
index 132f4bb..0000000
--- a/ebr/org.springframework.aspects-5.0.8.RELEASE/org.springframework.aspects.mf
+++ /dev/null
@@ -1,30 +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,
- javax.transaction;version="${javaxTransactionVersion:[=.=, +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.beans-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index cd78444..0000000
--- a/ebr/org.springframework.beans-4.2.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.2.9.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf
deleted file mode 100644
index 4005ddd..0000000
--- a/ebr/org.springframework.beans-4.2.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:
- 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:[=.=.=.=, =.=.=.=]}",
- 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.3.21.RELEASE/build.gradle b/ebr/org.springframework.beans-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index cd78444..0000000
--- a/ebr/org.springframework.beans-4.3.21.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.21.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.3.21.RELEASE/org.springframework.beans.mf
deleted file mode 100644
index 8e5882b..0000000
--- a/ebr/org.springframework.beans-4.3.21.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.beans-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index cd78444..0000000
--- a/ebr/org.springframework.beans-5.0.8.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-5.0.8.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-5.0.8.RELEASE/org.springframework.beans.mf
deleted file mode 100644
index a2a3c14..0000000
--- a/ebr/org.springframework.beans-5.0.8.RELEASE/org.springframework.beans.mf
+++ /dev/null
@@ -1,28 +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="${javaxElVersion:[=.=.0, +1)}";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,
- kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
- org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";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.context-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 652c1a5..0000000
--- a/ebr/org.springframework.context-4.2.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.2.9.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf
deleted file mode 100644
index 09182f1..0000000
--- a/ebr/org.springframework.context-4.2.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:
- 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.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",
- 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.3.21.RELEASE/build.gradle b/ebr/org.springframework.context-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 652c1a5..0000000
--- a/ebr/org.springframework.context-4.3.21.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.21.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.3.21.RELEASE/org.springframework.context.mf
deleted file mode 100644
index 67e2e8b..0000000
--- a/ebr/org.springframework.context-4.3.21.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.cache.*;version="${javaxCacheVersion:[=.=.=, +1)}";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="${ehcacheVersion:[=.=.=, +1)}";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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.context-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 652c1a5..0000000
--- a/ebr/org.springframework.context-5.0.8.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-5.0.8.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-5.0.8.RELEASE/org.springframework.context.mf
deleted file mode 100644
index 574413d..0000000
--- a/ebr/org.springframework.context-5.0.8.RELEASE/org.springframework.context.mf
+++ /dev/null
@@ -1,60 +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.cache.*;version="${javaxCacheVersion:[=.=.=, +1)}";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="${ehcacheVersion:[=.=.=, +1)}";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,
- kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
- org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";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.support-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index a6af036..0000000
--- a/ebr/org.springframework.context.support-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index a6af036..0000000
--- a/ebr/org.springframework.context.support-4.3.21.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.3.21.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-4.3.21.RELEASE/org.springframework.context.support.mf
deleted file mode 100644
index b7f4b55..0000000
--- a/ebr/org.springframework.context.support-4.3.21.RELEASE/org.springframework.context.support.mf
+++ /dev/null
@@ -1,42 +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:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- com.github.benmanes.caffeine.cache;version="${benmanesCaffeineVersion:[=.=.=, +1)}";resolution:=optional,
- com.google.common.*;version="[20,100)";resolution:=optional,
- commonj.*;version="${commonjVersion:[=.=.=, +1)}";resolution:=optional,
- freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.cache.*;version="${javaxCacheVersion:[=.=.=, +1)}";resolution:=optional,
- javax.mail.*;version="${javaxMailVersion:[=.=.0, +1)}";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.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="${quartzVersion:[=.=.=, +1)}";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.lang;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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.context.support-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index a6af036..0000000
--- a/ebr/org.springframework.context.support-5.0.8.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-5.0.8.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-5.0.8.RELEASE/org.springframework.context.support.mf
deleted file mode 100644
index b7f4b55..0000000
--- a/ebr/org.springframework.context.support-5.0.8.RELEASE/org.springframework.context.support.mf
+++ /dev/null
@@ -1,42 +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:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- com.github.benmanes.caffeine.cache;version="${benmanesCaffeineVersion:[=.=.=, +1)}";resolution:=optional,
- com.google.common.*;version="[20,100)";resolution:=optional,
- commonj.*;version="${commonjVersion:[=.=.=, +1)}";resolution:=optional,
- freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.cache.*;version="${javaxCacheVersion:[=.=.=, +1)}";resolution:=optional,
- javax.mail.*;version="${javaxMailVersion:[=.=.0, +1)}";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.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="${quartzVersion:[=.=.=, +1)}";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.lang;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.core-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.core-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index fc6f651..0000000
--- a/ebr/org.springframework.core-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.core-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index fc6f651..0000000
--- a/ebr/org.springframework.core-4.3.21.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.3.21.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-4.3.21.RELEASE/org.springframework.core.mf
deleted file mode 100644
index 4cf2d4d..0000000
--- a/ebr/org.springframework.core-4.3.21.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",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- joptsimple.*;version="${joptSimpleVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.tools.ant.*;version="0";resolution:=optional,
- org.apache.commons.codec.*;version="${commonsCodecVersion:[=.=.=, +1)}";resolution:=optional,
- 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.21.RELEASE/src/test/resources/bundle.conf b/ebr/org.springframework.core-4.3.21.RELEASE/src/test/resources/bundle.conf
deleted file mode 100644
index e69de29..0000000
--- a/ebr/org.springframework.core-4.3.21.RELEASE/src/test/resources/bundle.conf
+++ /dev/null
diff --git a/ebr/org.springframework.core-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.core-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index fc6f651..0000000
--- a/ebr/org.springframework.core-5.0.8.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-5.0.8.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-5.0.8.RELEASE/org.springframework.core.mf
deleted file mode 100644
index ad57b62..0000000
--- a/ebr/org.springframework.core-5.0.8.RELEASE/org.springframework.core.mf
+++ /dev/null
@@ -1,38 +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",
- org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- joptsimple.*;version="${joptSimpleVersion:[=.=.=, +1)}";resolution:=optional,
- org.apache.tools.ant.*;version="0";resolution:=optional,
- 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,
- 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}",
- 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.expression-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index cd029da..0000000
--- a/ebr/org.springframework.expression-4.2.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.2.9.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf
deleted file mode 100644
index 8363aac..0000000
--- a/ebr/org.springframework.expression-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.expression-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index cd029da..0000000
--- a/ebr/org.springframework.expression-4.3.21.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.21.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.3.21.RELEASE/org.springframework.expression.mf
deleted file mode 100644
index 8363aac..0000000
--- a/ebr/org.springframework.expression-4.3.21.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.expression-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index cd029da..0000000
--- a/ebr/org.springframework.expression-5.0.8.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-5.0.8.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-5.0.8.RELEASE/org.springframework.expression.mf
deleted file mode 100644
index 1bd694d..0000000
--- a/ebr/org.springframework.expression-5.0.8.RELEASE/org.springframework.expression.mf
+++ /dev/null
@@ -1,13 +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.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
- org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
-Export-Template:
- org.springframework.expression.*;version="${springframeworkVersion}"
diff --git a/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf b/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf
deleted file mode 100644
index 6dc1970..0000000
--- a/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-SymbolicName: org.springframework.instrument.tomcat
-Bundle-Name: Spring Instrument Tomcat Weaver
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Import-Template:
- org.apache.catalina.*;version="[6.0.16, 7.0.0)"
diff --git a/ebr/org.springframework.instrument/org.springframework.instrument.mf b/ebr/org.springframework.instrument/org.springframework.instrument.mf
deleted file mode 100644
index 0ceb406..0000000
--- a/ebr/org.springframework.instrument/org.springframework.instrument.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.springframework.instrument
-Bundle-Name: Spring Instrument
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Premain-Class: org.springframework.instrument.InstrumentationSavingAgent
diff --git a/ebr/org.springframework.jcl-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.jcl-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index e27f172..0000000
--- a/ebr/org.springframework.jcl-5.0.8.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-jcl', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.jcl-5.0.8.RELEASE/org.springframework.jcl.mf b/ebr/org.springframework.jcl-5.0.8.RELEASE/org.springframework.jcl.mf
deleted file mode 100644
index 957d676..0000000
--- a/ebr/org.springframework.jcl-5.0.8.RELEASE/org.springframework.jcl.mf
+++ /dev/null
@@ -1,16 +0,0 @@
-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.apache.commons.logging.*;version="1.2"
-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-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index f4e86ff..0000000
--- a/ebr/org.springframework.jdbc-4.2.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.2.9.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf
deleted file mode 100644
index 9c5be59..0000000
--- a/ebr/org.springframework.jdbc-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.jdbc-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index f4e86ff..0000000
--- a/ebr/org.springframework.jdbc-4.3.21.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.21.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.3.21.RELEASE/org.springframework.jdbc.mf
deleted file mode 100644
index 73eb113..0000000
--- a/ebr/org.springframework.jdbc-4.3.21.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="${h2Version:[=.=.=, +1)}";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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.jdbc-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index f4e86ff..0000000
--- a/ebr/org.springframework.jdbc-5.0.8.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-5.0.8.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-5.0.8.RELEASE/org.springframework.jdbc.mf
deleted file mode 100644
index 91e2477..0000000
--- a/ebr/org.springframework.jdbc-5.0.8.RELEASE/org.springframework.jdbc.mf
+++ /dev/null
@@ -1,41 +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="${h2Version:[=.=.=, +1)}";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,
- kotlin.*;version="${kotlinVersion:[=.=.=, +1)}";resolution:="optional",
- org.jetbrains.annotations.*;version="${orgJetbrainsAnnotations:[=.=.=, +1)}";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.jms-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 2e8586f..0000000
--- a/ebr/org.springframework.jms-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.jms-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 2e8586f..0000000
--- a/ebr/org.springframework.jms-4.3.21.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.3.21.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-4.3.21.RELEASE/org.springframework.jms.mf
deleted file mode 100644
index c54ee07..0000000
--- a/ebr/org.springframework.jms-4.3.21.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:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- 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.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.jms-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 2e8586f..0000000
--- a/ebr/org.springframework.jms-5.0.8.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-5.0.8.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-5.0.8.RELEASE/org.springframework.jms.mf
deleted file mode 100644
index 519c804..0000000
--- a/ebr/org.springframework.jms-5.0.8.RELEASE/org.springframework.jms.mf
+++ /dev/null
@@ -1,36 +0,0 @@
-Bundle-SymbolicName: org.springframework.jms
-Bundle-Name: Spring JMS
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- 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.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.lang.*;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.messaging-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index fc5a4cf..0000000
--- a/ebr/org.springframework.messaging-4.2.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.2.9.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf
deleted file mode 100644
index cd299e0..0000000
--- a/ebr/org.springframework.messaging-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index fc5a4cf..0000000
--- a/ebr/org.springframework.messaging-4.3.21.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.21.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.3.21.RELEASE/org.springframework.messaging.mf
deleted file mode 100644
index cd299e0..0000000
--- a/ebr/org.springframework.messaging-4.3.21.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.messaging-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index fc5a4cf..0000000
--- a/ebr/org.springframework.messaging-5.0.8.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-5.0.8.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-5.0.8.RELEASE/org.springframework.messaging.mf
deleted file mode 100644
index 1f39b38..0000000
--- a/ebr/org.springframework.messaging-5.0.8.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="${reactiveStreamsVersion:[=.=.=, +1)}";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="${reactorCoreVersion:[=.=.=, +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.orm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index f790231..0000000
--- a/ebr/org.springframework.orm-4.2.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.2.9.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf
deleted file mode 100644
index 2ba2d03..0000000
--- a/ebr/org.springframework.orm-4.2.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:
- 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.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,
- 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.3.21.RELEASE/build.gradle b/ebr/org.springframework.orm-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index f790231..0000000
--- a/ebr/org.springframework.orm-4.3.21.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.21.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.3.21.RELEASE/org.springframework.orm.mf
deleted file mode 100644
index f5abdf8..0000000
--- a/ebr/org.springframework.orm-4.3.21.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="${jdoApiVersion:[=.=, +1)}";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="${hibernateVersion:[=.=.=, +1)}";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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.orm-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index f790231..0000000
--- a/ebr/org.springframework.orm-5.0.8.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-5.0.8.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-5.0.8.RELEASE/org.springframework.orm.mf
deleted file mode 100644
index 81f9c4b..0000000
--- a/ebr/org.springframework.orm-5.0.8.RELEASE/org.springframework.orm.mf
+++ /dev/null
@@ -1,51 +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="${jdoApiVersion:[=.=, +1)}";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="${hibernateVersion:[=.=.=, +1)}";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.lang.*;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.oxm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 8e714fc..0000000
--- a/ebr/org.springframework.oxm-4.2.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.2.9.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf
deleted file mode 100644
index a442e30..0000000
--- a/ebr/org.springframework.oxm-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 8e714fc..0000000
--- a/ebr/org.springframework.oxm-4.3.21.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.21.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.3.21.RELEASE/org.springframework.oxm.mf
deleted file mode 100644
index a442e30..0000000
--- a/ebr/org.springframework.oxm-4.3.21.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.oxm-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 8e714fc..0000000
--- a/ebr/org.springframework.oxm-5.0.8.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-5.0.8.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-5.0.8.RELEASE/org.springframework.oxm.mf
deleted file mode 100644
index 36b2f00..0000000
--- a/ebr/org.springframework.oxm-5.0.8.RELEASE/org.springframework.oxm.mf
+++ /dev/null
@@ -1,29 +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.lang.*;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.test-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.test-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index b8eb387..0000000
--- a/ebr/org.springframework.test-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.test-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index b8eb387..0000000
--- a/ebr/org.springframework.test-4.3.21.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.3.21.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-4.3.21.RELEASE/org.springframework.test.mf
deleted file mode 100644
index 69ded2a..0000000
--- a/ebr/org.springframework.test-4.3.21.RELEASE/org.springframework.test.mf
+++ /dev/null
@@ -1,42 +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="[2.2.5, 4)";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.descriptor;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.springframework.mock.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.test.*;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,
- com.gargoylesoftware.htmlunit.*;version="0";resolution:=optional,
- javax.websocket.*;version="0";resolution:=optional,
- 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
-Export-Template:
- org.springframework.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.test-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.test-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index b8eb387..0000000
--- a/ebr/org.springframework.test-5.0.8.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-5.0.8.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-5.0.8.RELEASE/org.springframework.test.mf
deleted file mode 100644
index fde642a..0000000
--- a/ebr/org.springframework.test-5.0.8.RELEASE/org.springframework.test.mf
+++ /dev/null
@@ -1,47 +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="[2.2.5, 4)";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.descriptor;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.springframework.mock.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
- org.springframework.test.*;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,
- com.gargoylesoftware.htmlunit.*;version="0";resolution:=optional,
- javax.websocket.*;version="0";resolution:=optional,
- 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,
- 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:
- 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-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 8e17c12..0000000
--- a/ebr/org.springframework.transaction-4.2.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.2.9.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf
deleted file mode 100644
index 4f96228..0000000
--- a/ebr/org.springframework.transaction-4.2.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:
- 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.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.transaction-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 8e17c12..0000000
--- a/ebr/org.springframework.transaction-4.3.21.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.21.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.3.21.RELEASE/org.springframework.transaction.mf
deleted file mode 100644
index 421ce06..0000000
--- a/ebr/org.springframework.transaction-4.3.21.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="${javaxTransactionVersion:[=.=.=, +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.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.transaction-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 8e17c12..0000000
--- a/ebr/org.springframework.transaction-5.0.8.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-5.0.8.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-5.0.8.RELEASE/org.springframework.transaction.mf
deleted file mode 100644
index 304db4c..0000000
--- a/ebr/org.springframework.transaction-5.0.8.RELEASE/org.springframework.transaction.mf
+++ /dev/null
@@ -1,38 +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="${javaxTransactionVersion:[=.=.=, +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:[=.=.=.=, =.=.=.=]}",
- 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.web-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.web-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index 71a51f6..0000000
--- a/ebr/org.springframework.web-4.2.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/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.21.RELEASE/build.gradle b/ebr/org.springframework.web-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 71a51f6..0000000
--- a/ebr/org.springframework.web-4.3.21.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.3.21.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-4.3.21.RELEASE/org.springframework.web.mf
deleted file mode 100644
index f3e3524..0000000
--- a/ebr/org.springframework.web-4.3.21.RELEASE/org.springframework.web.mf
+++ /dev/null
@@ -1,62 +0,0 @@
-Bundle-SymbolicName: org.springframework.web
-Bundle-Name: Spring Web
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- 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.squareup.okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
- okhttp3.*;version="${okhttp3Version:[=.=.=, +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="${javaxElVersion:[=.=.=.=, +1)}";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="${javaxMailVersion:[=.=.=, +1)}";resolution:=optional,
- javax.portlet.*;version="[2, 3)";resolution:=optional,
- javax.servlet.*;version="[3.0.1, 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,
- javax.net.ssl;version="0";resolution:=optional,
- 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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.web-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index 71a51f6..0000000
--- a/ebr/org.springframework.web-5.0.8.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-5.0.8.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-5.0.8.RELEASE/org.springframework.web.mf
deleted file mode 100644
index 2e9aa19..0000000
--- a/ebr/org.springframework.web-5.0.8.RELEASE/org.springframework.web.mf
+++ /dev/null
@@ -1,74 +0,0 @@
-Bundle-SymbolicName: org.springframework.web
-Bundle-Name: Spring Web
-Bundle-Vendor: Eclipse Virgo
-Bundle-ManifestVersion: 2
-Bundle-Version: ${springframeworkVersion}
-Import-Template:
- org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
- com.caucho.*;version="${hessianVersion:[=.=.=, +1)}";resolution:=optional,
- com.fasterxml.aalto.*;version="${jacksonVersion:[=.=.=, +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.okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
- okhttp3.*;version="${okhttp3Version:[=.=.=, +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="${javaxElVersion:[=.=.=.=, +1)}";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="${javaxMailVersion:[=.=.=, +1)}";resolution:=optional,
- javax.portlet.*;version="[2, 3)";resolution:=optional,
- 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,
- javax.xml.*;version="0";resolution:=optional,
- javax.net.ssl;version="0";resolution:=optional,
- 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,
- 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}",
- org.springframework.web.*;version="${springframeworkVersion}"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/ebr/org.springframework.webflux-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.webflux-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index de2312b..0000000
--- a/ebr/org.springframework.webflux-5.0.8.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webflux', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webflux-5.0.8.RELEASE/org.springframework.webflux.mf b/ebr/org.springframework.webflux-5.0.8.RELEASE/org.springframework.webflux.mf
deleted file mode 100644
index 3ec226b..0000000
--- a/ebr/org.springframework.webflux-5.0.8.RELEASE/org.springframework.webflux.mf
+++ /dev/null
@@ -1,44 +0,0 @@
-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.2.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index ac18802..0000000
--- a/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf
deleted file mode 100644
index 7252e6f..0000000
--- a/ebr/org.springframework.webmvc-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.webmvc-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index ac18802..0000000
--- a/ebr/org.springframework.webmvc-4.3.21.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webmvc-4.3.21.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.3.21.RELEASE/org.springframework.webmvc.mf
deleted file mode 100644
index 8444fae..0000000
--- a/ebr/org.springframework.webmvc-4.3.21.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="${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.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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.webmvc-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index ac18802..0000000
--- a/ebr/org.springframework.webmvc-5.0.8.RELEASE/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
- sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
-}
diff --git a/ebr/org.springframework.webmvc-5.0.8.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-5.0.8.RELEASE/org.springframework.webmvc.mf
deleted file mode 100644
index d46a09e..0000000
--- a/ebr/org.springframework.webmvc-5.0.8.RELEASE/org.springframework.webmvc.mf
+++ /dev/null
@@ -1,63 +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="${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.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,
- 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,
- org.reactivestreams.*;version="${reactiveStreamsVersion:[=.=.=, +1)}";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.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.21.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index 4f47288..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.3.21.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.21.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.3.21.RELEASE/org.springframework.webmvc.portlet.mf
deleted file mode 100644
index 9b5b967..0000000
--- a/ebr/org.springframework.webmvc.portlet-4.3.21.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.2.9.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle
deleted file mode 100644
index a86cf8e..0000000
--- a/ebr/org.springframework.websocket-4.2.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.2.9.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf
deleted file mode 100644
index 6935ab3..0000000
--- a/ebr/org.springframework.websocket-4.2.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.3.21.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.3.21.RELEASE/build.gradle
deleted file mode 100644
index a86cf8e..0000000
--- a/ebr/org.springframework.websocket-4.3.21.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.21.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.3.21.RELEASE/org.springframework.websocket.mf
deleted file mode 100644
index 96f225e..0000000
--- a/ebr/org.springframework.websocket-4.3.21.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.5.31, 9)";resolution:=optional,
- org.eclipse.jetty.*;version="[9.4.6.v20170531, 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-5.0.8.RELEASE/build.gradle b/ebr/org.springframework.websocket-5.0.8.RELEASE/build.gradle
deleted file mode 100644
index a86cf8e..0000000
--- a/ebr/org.springframework.websocket-5.0.8.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-5.0.8.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-5.0.8.RELEASE/org.springframework.websocket.mf
deleted file mode 100644
index 96f225e..0000000
--- a/ebr/org.springframework.websocket-5.0.8.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.5.31, 9)";resolution:=optional,
- org.eclipse.jetty.*;version="[9.4.6.v20170531, 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/settings.gradle b/ebr/settings.gradle
index affd544..3ed5a0c 100644
--- a/ebr/settings.gradle
+++ b/ebr/settings.gradle
@@ -1,22 +1,5 @@
-include "org.springframework.aop-${springframeworkVersion}"
-include "org.springframework.aspects-${springframeworkVersion}"
-include "org.springframework.beans-${springframeworkVersion}"
-include "org.springframework.context-${springframeworkVersion}"
-include "org.springframework.context.support-${springframeworkVersion}"
-include "org.springframework.core-${springframeworkVersion}"
-include "org.springframework.expression-${springframeworkVersion}"
-include "org.springframework.jdbc-${springframeworkVersion}"
-include "org.springframework.jcl-${springframeworkVersion}"
-include "org.springframework.jms-${springframeworkVersion}"
-include "org.springframework.messaging-${springframeworkVersion}"
-include "org.springframework.orm-${springframeworkVersion}"
-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.websocket-${springframeworkVersion}"
-include "org.springframework.test-${springframeworkVersion}"
-include "org.aspectj.weaver-${aspectjVersion}"
-include "com.squareup.okio-${okioVersion}"
-include "com.squareup.okhttp3-${okhttp3Version}"
+// Empty settings.gradle
+
+// Why?
+//* What went wrong:
+//Project directory '/jobs/genie.virgo/virgo-master/workspace/ebr' is not part of the build defined by settings file '/jobs/genie.virgo/virgo-master/workspace/settings.gradle'. If this is an unrelated build, it must have its own settings file.
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java b/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
deleted file mode 100644
index 286e09f..0000000
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.virgo.ebr;
-
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-import javax.inject.Inject;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.osgi.framework.Bundle.ACTIVE;
-
-/**
- * Abstract test class to be extended by all test implementations.
- * <p>
- * Created by dam on 6/14/17.
- */
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public abstract class AbstractBaseTest {
-
- static final String MIRROR_GROUP = "org.eclipse.virgo.mirrored";
-
- @Inject
- private BundleContext bundleContext;
-
- public abstract Option[] config();
-
- void assertBundleActive(String symbolicName) throws BundleException {
- assumeNotNull(symbolicName);
- assumeFalse(symbolicName.isEmpty());
- for (Bundle b : this.bundleContext.getBundles()) {
- if (symbolicName.equals(b.getSymbolicName())) {
- if (ACTIVE != b.getState()) {
- b.start(); // start the bundle so we get the exception
- }
- return;
- }
- }
- fail("Bundle with symbolicName [" + symbolicName + "] could not be found.");
- }
-
- static String resolveVersionFromGradleProperties(String libraryName) {
- String versionString = "unresolved";
- String gradlePropertiesFile = "gradle.properties";
- try {
- Properties gradleProperties = new Properties();
- gradleProperties.load(new FileInputStream(gradlePropertiesFile));
- if (!gradleProperties.containsKey(libraryName)) {
- fail("Couldn't resolve '" + libraryName + "' in '" + gradlePropertiesFile + "'.");
- }
- return gradleProperties.getProperty(libraryName);
- } catch (IOException e) {
- fail("Failed to load '" + gradlePropertiesFile + " ' to get version for '" + libraryName + "'.");
- }
- return versionString;
- }
-}
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java b/ebr/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java
deleted file mode 100644
index 8cead01..0000000
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/GeminiBlueprint3Test.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.virgo.ebr;
-
-import org.junit.Test;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-
-import static org.ops4j.pax.exam.CoreOptions.*;
-
-public class GeminiBlueprint3Test 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 GEMINI_BLUEPRINT_VERSION = "3.0.0.M01";
- private static final String SF_VERSION = "5.0.8.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";
- private static final String SF_AOP = SF_PREFIX + "aop";
- private static final String SF_ASPECTS = SF_PREFIX + "aspects";
- private static final String SF_EXPRESSION = SF_PREFIX + "expression";
- private static final String SF_CONTEXT = SF_PREFIX + "context";
- 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_JCL = SF_PREFIX + "jcl";
- private static final String SF_JDBC = SF_PREFIX + "jdbc";
- 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_WEBSOCKET = SF_PREFIX + "websocket";
-
- @Configuration
- @Override
- public Option[] config() {
- return options(
- // spring framework dependencies
- mavenBundle("javax.servlet", "javax.servlet-api", "3.1.0"),
- mavenBundle("javax.portlet", "portlet-api", "2.0"),
- bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/oevm.org.aopalliance/1.0.0/oevm.org.aopalliance-1.0.0.jar"),
- bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/javax.jms/1.1.0.v201205091237/javax.jms-1.1.0.v201205091237.jar"),
- // maven local
- mavenBundle(MIRROR_GROUP, ASPECTJ_WEAVER, ASPECTJ_WEAVER_VERSION),
- mavenBundle(MIRROR_GROUP, SF_CORE, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_BEANS, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_AOP, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_ASPECTS, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_EXPRESSION, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_CONTEXT, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_CONTEXT_SUPPORT, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_TRANSACTION, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_JCL, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_JDBC, SF_VERSION),
- mavenBundle(MIRROR_GROUP, SF_MESSAGING, 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_WEBSOCKET, SF_VERSION),
-
- mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-io", GEMINI_BLUEPRINT_VERSION),
- mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-core", GEMINI_BLUEPRINT_VERSION),
- mavenBundle("org.eclipse.gemini.blueprint", "gemini-blueprint-extender", GEMINI_BLUEPRINT_VERSION),
-
- // specify junit bundles
- junitBundles()
- );
- }
-
- @Test
- public void testGeminiBlueprintIo() throws Exception {
- assertBundleActive("org.eclipse.gemini.blueprint.io");
- }
-
- @Test
- public void testGeminiBlueprintCore() throws Exception {
- assertBundleActive("org.eclipse.gemini.blueprint.core");
- }
-
- @Test
- public void testGeminiBlueprintExtender() throws Exception {
- assertBundleActive("org.eclipse.gemini.blueprint.extender");
- }
-}
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java b/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
deleted file mode 100644
index 3154d3a..0000000
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.virgo.ebr;
-
-import org.junit.Test;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-
-import static org.ops4j.pax.exam.CoreOptions.*;
-
-/**
- * Test class testing OkHttp3 bundle resolution.
- * <p>
- * Created by dam on 6/14/17.
- */
-public class OkHttp3Test extends AbstractBaseTest {
-
- private static final String OKIO = "com.squareup.okio";
- private static final String OKIO_VERSION_KEY = "okioVersion";
-
- private static final String OKHTTP3 = "com.squareup.okhttp3";
- private static final String OKHTTP3_VERSION_KEY = "okhttp3Version";
-
- @Configuration
- @Override
- public Option[] config() {
- return options(
- // maven local
- mavenBundle(MIRROR_GROUP, OKIO, resolveVersionFromGradleProperties(OKIO_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, OKHTTP3, resolveVersionFromGradleProperties(OKHTTP3_VERSION_KEY)),
- // specify junit bundles
- junitBundles()
- );
- }
-
- @Test
- public void testOkio() throws Exception {
- assertBundleActive(OKIO);
- }
-
- @Test
- public void testOkHttp3() throws Exception {
- assertBundleActive(OKHTTP3);
- }
-}
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java b/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
deleted file mode 100644
index 3812128..0000000
--- a/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.virgo.ebr;
-
-import org.junit.Test;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-
-import static org.ops4j.pax.exam.CoreOptions.*;
-
-/**
- * Test class testing Spring Framework bundle resolution.
- * <p>
- * Created by dam on 6/9/17.
- */
-public class SpringFrameworkTest extends AbstractBaseTest {
-
- private static final String ASPECTJ_WEAVER_VERSION_KEY = "aspectjVersion";
- private static final String ASPECTJ_WEAVER = "org.aspectj.weaver";
-
- private static final String SF_VERSION_KEY = "springframeworkVersion";
-
- 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";
- private static final String SF_AOP = SF_PREFIX + "aop";
- private static final String SF_ASPECTS = SF_PREFIX + "aspects";
- private static final String SF_EXPRESSION = SF_PREFIX + "expression";
- private static final String SF_CONTEXT = SF_PREFIX + "context";
- 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_JCL = SF_PREFIX + "jcl";
- private static final String SF_JDBC = SF_PREFIX + "jdbc";
- 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_WEBSOCKET = SF_PREFIX + "websocket";
-
- @Configuration
- @Override
- public Option[] config() {
- return options(
- // spring framework dependencies
- mavenBundle("javax.servlet", "javax.servlet-api", "3.1.0"),
- mavenBundle("javax.portlet", "portlet-api", "2.0"),
- bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/oevm.org.aopalliance/1.0.0/oevm.org.aopalliance-1.0.0.jar"),
- bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/javax.jms/1.1.0.v201205091237/javax.jms-1.1.0.v201205091237.jar"),
- // maven local
- mavenBundle(MIRROR_GROUP, ASPECTJ_WEAVER, resolveVersionFromGradleProperties(ASPECTJ_WEAVER_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_CORE, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_BEANS, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_AOP, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_ASPECTS, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_EXPRESSION, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_CONTEXT, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_CONTEXT_SUPPORT, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_TRANSACTION, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_JCL, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_JDBC, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_MESSAGING, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_JMS, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_ORM, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_OXM, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_WEB, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_WEBFLUX, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_WEBMVC, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- mavenBundle(MIRROR_GROUP, SF_WEBSOCKET, resolveVersionFromGradleProperties(SF_VERSION_KEY)),
- // specify junit bundles
- junitBundles()
- );
- }
-
- @Test
- public void testAspectjWeaver() throws Exception {
- assertBundleActive(ASPECTJ_WEAVER);
- }
-
- @Test
- public void testSpringCore() throws Exception {
- assertBundleActive(SF_CORE);
- }
-
- @Test
- public void testSpringBeans() throws Exception {
- assertBundleActive(SF_BEANS);
- }
-
- @Test
- public void testSpringAop() throws Exception {
- assertBundleActive(SF_AOP);
- }
-
- @Test
- public void testSpringAspects() throws Exception {
- assertBundleActive(SF_ASPECTS);
- }
-
- @Test
- public void testSpringExpression() throws Exception {
- assertBundleActive(SF_EXPRESSION);
- }
-
- @Test
- public void testSpringContext() throws Exception {
- assertBundleActive(SF_CONTEXT);
- }
-
- @Test
- public void testSpringContextSupport() throws Exception {
- assertBundleActive(SF_CONTEXT_SUPPORT);
- }
-
- @Test
- public void testSpringTransaction() throws Exception {
- assertBundleActive(SF_TRANSACTION);
- }
-
- @Test
- public void testSpringJcl() throws Exception {
- assertBundleActive(SF_JCL);
- }
-
- @Test
- public void testSpringJdbc() throws Exception {
- assertBundleActive(SF_JDBC);
- }
-
- @Test
- public void testSpringMessaging() throws Exception {
- assertBundleActive(SF_MESSAGING);
- }
-
- @Test
- public void testSpringJsm() throws Exception {
- assertBundleActive(SF_JMS);
- }
-
- @Test
- public void testSpringOrm() throws Exception {
- assertBundleActive(SF_ORM);
- }
-
- @Test
- public void testSpringOxm() throws Exception {
- assertBundleActive(SF_OXM);
- }
-
- @Test
- public void testSpringWeb() throws Exception {
- assertBundleActive(SF_WEB);
- }
-
- @Test
- public void testSpringWebMvc() throws Exception {
- assertBundleActive(SF_WEBMVC);
- }
-
- @Test
- public void testSpringWebflux() throws Exception {
- assertBundleActive(SF_WEBFLUX);
- }
-
- @Test
- public void testSpringWebsocket() throws Exception {
- assertBundleActive(SF_WEBSOCKET);
- }
-}
diff --git a/gradle.properties b/gradle.properties
index f43f534..97a6f2c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,19 @@
# Eclipse JDT Core Batch Compiler
ecjVersion = 4.6.1
-# CQ4129 (PB CQ3480)
-junitVersion = 4.7
+# CQ4129 (PB CQ3480) JUnit Version 4.7
+junitVersion = 4.12
# CQ4132 (PB CQ1887)
easymockVersion = 2.3
# PaxExam
-# CQ8541
-paxExamJunit4Version = 4.1.0
-paxExamContainerNativeVersion = 4.1.0
-paxExamLinkMvnVersion = 4.1.0
-paxUrlAetherVersion = 1.3.5
-paxUrlWrapVersion = 2.3.0
+# CQ8541 for version 4.1.0, ...
+paxExamJunit4Version = 4.13.1
+paxExamContainerNativeVersion = 4.13.1
+paxExamLinkMvnVersion = 4.13.1
+paxUrlAetherVersion = 2.6.1
+paxUrlWrapVersion = 2.6.1
# CQ 13678 SLF4J jcl-over-slf4j Version: 1.7.25
# CQ 13367 SLF4J jul-to-slf4j Version: 1.7.25
@@ -129,8 +129,9 @@
minaCoreVersion = 2.0.2.v201108120515
#CQ4033
-orgAopAllianceVersion = 1.0.0
-aopAllianceHash = 112e747528df9af5a40e9a2ba51960309daf58de
+aopallianceVersion = 1.0.0
+# used to resolve the Maven dependency
+aopallianceVersionMaven = 1.0
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -171,20 +172,24 @@
scannotationVersion = 1.0.2.v201205170710
commonsBeanutilsVersion = 1.8.0.v201205091237
-# CQ 10288 (PB CQ9217)
-commonsCodecVersion = 1.10.0
-commonsCodecHash = 8aff50e99bd7e53f8c4f5fe45c2a63f1d47dd19c
-commonsCliVersion = 1.2.0
+
+# commons-codec CQ 10288 (PB CQ9217) - version 1.10
+commonsCodecVersion = 1.10
+commonsCodecHash = 4b95f4897fa13f2cd904aee711aeafc0c5295cd8
+
+# commons-cli
+commonsCliVersion = 1.2
+
# CQ12542 (PB CQ10386)
commonsCollectionsVersion = 3.2.2
commonsDbcpVersion = 1.4.0.v201204271417
# CQ12541 (PB CQ12051)
commonsFileuploadVersion = 1.3.2
-# CQ9555 (PB Orbit CQ8938) - version 4.3.3
-httpcomponentsCoreVersion = 4.4.12
-# CQ9556 (PB Orbit CQ8934) - version 4.3.6
-httpcomponentsClientVersion = 4.5.10
+# CQ9555 (PB Orbit CQ8938) Version 4.3.3
+httpcoreVersion = 4.4.12
+# CQ9556 (PB Orbit CQ8934) Version 4.3.6
+httpclientVersion = 4.5.10
# CQ13049
commonsIoVersion = 2.5
@@ -236,8 +241,13 @@
# CQ6093 ejb-api Version: 3.1.1
javaxEjbVersion=3.1.1.v201204261316
javaxElVersion=3.0.0.20180730
-# CQ6090 (PB Orbit CQ3578)
-javaxInjectVersion = 1.0.0.v20091030
+
+# javax.inject - CQ6090 (PB Orbit CQ3578)
+# Version used in OSGi context / feature.xml
+javaxInjectVersion = 1.0.0
+# Glassfish bundle version that packages javax.inject 1
+glassfishJavaxInjectVersion = 2.5.0-b62
+
javaxJmsVersion=1.1.0.v201205091237
# CQ12547 (PB CQ11275) - 1.5.5
javaxMailVersion = 1.5.6
@@ -308,7 +318,7 @@
mozillaJavascriptVersion = 1.7.4.v201209142200
# CQ7126 Hibernate Version: 4.1.0
# TODO - upgrade to 4.3.2.Final used in spring-context
-hibernateVersion = 4.1.0.Final
+hibernateCoreVersion = 4.1.0.Final
# integration-tests
hsqldbVersion = 2.3.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca9d628..3a54a33 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index b0d6d0a..83f2acf 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index 15e1ee3..24467a1 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
index 0485eeb..cb1512b 100644
--- a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
@@ -10,9 +10,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-context'
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
index 0d45f69..e61437b 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
@@ -7,9 +7,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-context'
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
index a3857c3..4263f43 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
@@ -1,22 +1,17 @@
-import aQute.bnd.gradle.Bundle
-
test.dependsOn ':3rd-party:bundles'
-task bundle(type: Bundle) {
- bndfile = 'bundle.bnd'
- from sourceSets.test.output
- sourceSet = sourceSets.test
+apply plugin: 'idea'
+idea {
+ module {
+ inheritOutputDirs = true
+ }
}
-task unzip(type: Copy, dependsOn: [bundle, tasks['compileTestJava']]) {
- println bundle.outputs.files.singleFile
- println bundle.outputs.files.singleFile.class
- from zipTree(bundle.outputs.files.singleFile).matching {
- include 'META-INF/MANIFEST.MF'
- }
- into("${buildDir}/classes/java/test")
- tasks['test'].dependsOn(unzip)
+task copyTestResources(type: Copy) {
+ from "${projectDir}/src/test/resources"
+ into "${buildDir}/classes/java/test"
}
+processTestResources.dependsOn copyTestResources
test {
maxHeapSize = '1G'
@@ -45,8 +40,8 @@
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.shell", version: gogoShellVersion, configuration: "compile", ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
+ testImplementation 'org.springframework:spring-context'
+ testRuntimeOnly 'org.springframework:spring-expression'
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.dbcp", version: commonsDbcpVersion, configuration: "compile", ext: "jar"
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.pool", version: commonsPoolVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index e3fc4b7..0bc4cdd 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -4,7 +4,7 @@
file:${gradle.cache}/org.slf4j/slf4j-api/${slf4jVersion}/${slf4jApiHash}/slf4j-api-${slf4jVersion}.jar,\
file:${gradle.cache}/org.slf4j/jcl-over-slf4j/${slf4jVersion}/${slf4jJclOverSlf4jHash}/jcl-over-slf4j-${slf4jVersion}.jar@start,\
file:${gradle.cache}/org.slf4j/jul-to-slf4j/${slf4jVersion}/${slf4jJulToSlf4jHash}/jul-to-slf4j-${slf4jVersion}.jar,\
- file:../../ebr/org.aspectj.weaver-${aspectjVersion}/build/org.aspectj.weaver-${aspectjVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.aspectj.weaver_${aspectjVersion}.jar,\
file:../../medic/org.eclipse.virgo.medic.logbackcorefragment/build/libs/org.eclipse.virgo.medic.logbackcorefragment-${version}.jar,\
file:../../medic/org.eclipse.virgo.medic.logbackclassicfragment/build/libs/org.eclipse.virgo.medic.logbackclassicfragment-${version}.jar,\
file:${gradle.cache}/ch.qos.logback/logback-core/${logbackVersion}/${logbackCoreHash}/logback-core-${logbackVersion}.jar,\
@@ -31,20 +31,20 @@
file:../../nano/org.eclipse.virgo.nano.deployer.api/build/libs/org.eclipse.virgo.nano.deployer.api-${version}.jar@start,\
file:../../nano/org.eclipse.virgo.nano.deployer.hot/build/libs/org.eclipse.virgo.nano.deployer.hot-${version}.jar@start,\
file:../../nano/org.eclipse.virgo.nano.management/build/libs/org.eclipse.virgo.nano.management-${version}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/oevm.org.aopalliance/${orgAopAllianceVersion}/${aopAllianceHash}/oevm.org.aopalliance-${orgAopAllianceVersion}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.aop/${springframeworkVersion}/${springAopHash}/org.springframework.aop-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.core/${springframeworkVersion}/${springCoreHash}/org.springframework.core-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.beans/${springframeworkVersion}/${springBeansHash}/org.springframework.beans-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.expression/${springframeworkVersion}/${springExpressionHash}/org.springframework.expression-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.context/${springframeworkVersion}/${springContextHash}/org.springframework.context-${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/build/libs/org.eclipse.virgo.kernel.agent.dm-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/build/libs/org.eclipse.virgo.kernel.kerneldmfragment-${version}.jar,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-io/${geminiBlueprintVersion}/${blueprintIoHash}/gemini-blueprint-io-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-core/${geminiBlueprintVersion}/${blueprintCoreHash}/gemini-blueprint-core-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-extender/${geminiBlueprintVersion}/${blueprintExtenderHash}/gemini-blueprint-extender-${geminiBlueprintVersion}.jar@start,\
- file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcomponentsCoreVersion}.jar@start,\
- file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpcomponentsClientVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.commons.codec/${commonsCodecVersion}/${commonsCodecHash}/org.apache.commons.codec-${commonsCodecVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcoreVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpclientVersion}.jar@start,\
+ file:${gradle.cache}/commons-codec/commons-codec/${commonsCodecVersion}/${commonsCodecHash}/commons-codec-${commonsCodecVersion}.jar@start,\
file:../../repository/org.eclipse.virgo.repository/build/libs/org.eclipse.virgo.repository-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.artifact/build/libs/org.eclipse.virgo.kernel.artifact-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 9e6669f..bf6179c 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,15 +1,9 @@
gradle.cache = %gradle.cache%
version = 3.8.0.BUILD-SNAPSHOT
-orgAopAllianceVersion = 1.0.0
-aopAllianceHash = 112e747528df9af5a40e9a2ba51960309daf58de
+aopallianceVersion = 1.0.0
springframeworkVersion = 5.0.8.RELEASE
-springAopHash = 323910d0bd37c13ff534ef62fba303a9bcef1451
-springBeansHash = bf5fd324c11eb63777f810250cb8c2ea292f9279
-springExpressionHash = 92cc7dd736b78420d7a1bcc76b4946f847b0501
-springContextHash = e84a767d680ba3d4c9dedbf787d32e570bdfc7ff
-springCoreHash = 415c7d22dcab46985f27bbe1ce6de968e073497c
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -52,29 +46,18 @@
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.agent.dm/build/libs/org.eclipse.virgo.kernel.agent.dm-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.dmfragment/build/libs/org.eclipse.virgo.kernel.dmfragment-${version}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/oevm.org.aopalliance/${orgAopAllianceVersion}/${aopAllianceHash}/oevm.org.aopalliance-${orgAopAllianceVersion}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.aop/${springframeworkVersion}/${springAopHash}/org.springframework.aop-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.expression/${springframeworkVersion}/${springExpressionHash}/org.springframework.expression-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.core/${springframeworkVersion}/${springCoreHash}/org.springframework.core-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.beans/${springframeworkVersion}/${springBeansHash}/org.springframework.beans-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.context/${springframeworkVersion}/${springContextHash}/org.springframework.context-${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-io/${geminiBlueprintVersion}/${blueprintIoHash}/gemini-blueprint-io-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-core/${geminiBlueprintVersion}/${blueprintCoreHash}/gemini-blueprint-core-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-extender/${geminiBlueprintVersion}/${blueprintExtenderHash}/gemini-blueprint-extender-${geminiBlueprintVersion}.jar@start,\
file:../org.eclipse.virgo.kernel.userregion/build/libs/org.eclipse.virgo.kernel.userregion-${version}.jar@start,\
file:${gradle.cache}/org.hsqldb/hsqldb/${hsqldbVersion}/${hsqldbHash}/hsqldb-${hsqldbVersion}.jar
-# missing bundles in kernel.test
-# file:../org.eclipse.virgo.kernel.deployer.dm/target/classes@start,\
-# file:${ivy.cache}/repository/org.springframework/org.springframework.orm/3.1.0.RELEASE/org.springframework.orm-3.1.0.RELEASE.jar@start,\
-# file:${ivy.cache}/repository/org.springframework/org.springframework.transaction/3.1.0.RELEASE/org.springframework.transaction-3.1.0.RELEASE.jar@start,\
-# file:${ivy.cache}/repository/org.springframework/org.springframework.jdbc/3.1.0.RELEASE/org.springframework.jdbc-3.1.0.RELEASE.jar@start,\
-# file:${ivy.cache}/repository/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar,\
-# file:${ivy.cache}/repository/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-2.0.0.b41-beta2.jar
-# file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
-# file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
-
-
bundleImports = org.eclipse.osgi;bundle-version="0"
packageImports =\
@@ -93,7 +76,6 @@
org.eclipse.virgo.nano.serviceability;version="0",\
org.eclipse.virgo.nano.serviceability.*;version="0",\
org.eclipse.virgo.kernel.services.work;version="0",\
- org.eclipse.virgo.kernel.shell;version="0",\
org.eclipse.virgo.nano.shim.*;version="0",\
org.eclipse.virgo.medic.*;version="0",\
org.eclipse.virgo.repository;version="0",\
@@ -113,6 +95,7 @@
org.slf4j.spi;version="[1.6.4,2)",\
org.junit;version="[4.7.0,5.0.0)",\
org.junit.runner;version="[4.7.0,5.0.0)",\
+ org.springframework.lang;version="[5.0.8,6)",\
org.springframework.util;version="[5.0.8,6)"
serviceImports =\
diff --git a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
index 3054c03..769f7e5 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
@@ -11,9 +11,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-context'
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java b/kernel/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
index 2b5c57c..dfbc6c8 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
@@ -11,28 +11,34 @@
package org.eclipse.virgo.kernel.install.artifact.internal;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
import org.eclipse.virgo.util.io.PathReference;
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static junit.framework.TestCase.assertNotNull;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.*;
public class FileMovingArtifactStoreTests {
- private static final String TEST_PATH = "build/fileMovingArtifactStoreTests/";
+ @Rule
+ public TemporaryFolder artifactStore = new TemporaryFolder();
private static final String TEST_FILENAME = "some.jar";
private ArtifactStore artifactHistory;
@Before
- public void setUp() throws Exception {
- PathReference basePathReference = new PathReference(TEST_PATH + TEST_FILENAME);
+ public void setUp() {
+ Path artifactStoreRoot = Paths.get(artifactStore.getRoot().toURI());
+ PathReference basePathReference = new PathReference(artifactStoreRoot + File.separator + TEST_FILENAME);
basePathReference.delete(true);
this.artifactHistory = new FileMovingArtifactStore(basePathReference);
}
@@ -49,7 +55,7 @@
this.artifactHistory.save();
PathReference c = this.artifactHistory.getCurrentPath();
checkPath(c);
- assertTrue(original.equals(c));
+ assertEquals(original, c);
}
@Test
@@ -59,7 +65,7 @@
this.artifactHistory.restore();
PathReference c = this.artifactHistory.getCurrentPath();
checkPath(c);
- assertTrue(original.equals(c));
+ assertEquals(original, c);
}
@Test
@@ -70,8 +76,8 @@
this.artifactHistory.save();
PathReference last = this.artifactHistory.getCurrentPath();
checkPath(last);
- assertTrue(original.equals(next));
- assertTrue(original.equals(last));
+ assertEquals(original, next);
+ assertEquals(original, last);
}
@Test
@@ -149,10 +155,11 @@
private void checkPath(PathReference c) {
File file = c.toFile();
- assertTrue(file.toURI().toString().indexOf(TEST_PATH) != -1);
+ assertThat(file.toURI().toString(), containsString(artifactStore.getRoot().toString()));
assertEquals(TEST_FILENAME, c.getName());
- assertFalse(c.exists());
+ assertFalse("PathReference " + c + " should not exist", c.exists());
PathReference parent = c.getParent();
+ assertNotNull(parent);
assertTrue(parent.isDirectory());
assertTrue(parent.exists());
}
diff --git a/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
index f1d0ac5..c490771 100644
--- a/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
@@ -3,10 +3,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context.support", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-context-support'
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.model/build.gradle b/kernel/org.eclipse.virgo.kernel.model/build.gradle
index 6e6d869..924685d 100644
--- a/kernel/org.eclipse.virgo.kernel.model/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.model/build.gradle
@@ -1,9 +1,7 @@
dependencies {
testCompile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ testImplementation 'org.springframework:spring-context'
testCompile project(':test:org.eclipse.virgo.test.stubs')
testCompile project(':kernel:org.eclipse.virgo.kernel.stubs')
diff --git a/kernel/org.eclipse.virgo.kernel.services/build.gradle b/kernel/org.eclipse.virgo.kernel.services/build.gradle
index 4cd10ce..07afc94 100644
--- a/kernel/org.eclipse.virgo.kernel.services/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.services/build.gradle
@@ -23,7 +23,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-beans'
compile project(':util:org.eclipse.virgo.util.math')
compile project(':util:org.eclipse.virgo.util.io')
diff --git a/kernel/org.eclipse.virgo.kernel.test/build.gradle b/kernel/org.eclipse.virgo.kernel.test/build.gradle
index e701e1e..d53932f 100644
--- a/kernel/org.eclipse.virgo.kernel.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.test/build.gradle
@@ -2,6 +2,13 @@
test.dependsOn ':3rd-party:bundles'
+apply plugin: 'idea'
+idea {
+ module {
+ inheritOutputDirs = true
+ }
+}
+
task bundle(type: Bundle) {
bndfile = 'bundle.bnd'
from sourceSets.test.output
@@ -18,7 +25,9 @@
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.framework')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testImplementation 'org.springframework:spring-context'
+
+ testRuntimeOnly "org.aspectj:aspectjrt:${project.aspectjVersion}"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.test/data/monitor-blueprint/delay/delay/Bean.class b/kernel/org.eclipse.virgo.kernel.test/data/monitor-blueprint/delay/delay/Bean.class
deleted file mode 100644
index ab7d971..0000000
--- a/kernel/org.eclipse.virgo.kernel.test/data/monitor-blueprint/delay/delay/Bean.class
+++ /dev/null
Binary files differ
diff --git a/kernel/org.eclipse.virgo.kernel.test/data/monitor/delay/delay/Bean.class b/kernel/org.eclipse.virgo.kernel.test/data/monitor/delay/delay/Bean.class
deleted file mode 100644
index ab7d971..0000000
--- a/kernel/org.eclipse.virgo.kernel.test/data/monitor/delay/delay/Bean.class
+++ /dev/null
Binary files differ
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/AbstractKernelIntegrationTest.java b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/AbstractKernelIntegrationTest.java
index e41a024..a03a9d2 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/AbstractKernelIntegrationTest.java
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/AbstractKernelIntegrationTest.java
@@ -11,13 +11,6 @@
package org.eclipse.virgo.kernel.test;
-import static org.junit.Assert.assertFalse;
-
-import java.lang.management.ManagementFactory;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
import org.eclipse.virgo.test.framework.dmkernel.DmKernelTestRunner;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -25,6 +18,12 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+
+import static org.junit.Assert.assertNotEquals;
+
@RunWith(DmKernelTestRunner.class)
public abstract class AbstractKernelIntegrationTest {
@@ -37,19 +36,22 @@
this.kernelContext = getKernelContext();
}
+ @BeforeClass
+ public static void awaitKernelStartup() throws Exception {
+ if (System.getProperty("await.kernel.startup", "true").equals("true")) {
+ MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+ int sleepCount = 1000;
+ while (!"STARTED".equals(platformMBeanServer.getAttribute(new ObjectName("org.eclipse.virgo.kernel:type=KernelStatus"), "Status"))) {
+ Thread.sleep(60);
+ if (--sleepCount == 0)
+ break;
+ }
+ assertNotEquals("Waited for Kernel too long.", 0, sleepCount);
+ }
+ }
+
private BundleContext getKernelContext() {
return this.context.getBundle(0L).getBundleContext();
}
- @BeforeClass
- public static void awaitKernelStartup() throws Exception {
- MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
- int sleepCount = 1000;
- while (!"STARTED".equals(platformMBeanServer.getAttribute(new ObjectName("org.eclipse.virgo.kernel:type=KernelStatus"), "Status"))) {
- Thread.sleep(60);
- if (--sleepCount == 0)
- break;
- }
- assertFalse("Waited for Kernel too long.", sleepCount == 0);
- }
}
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java
index 3b8af4d..b925ff2 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardBundleStarterSignallingTests.java
@@ -11,13 +11,6 @@
package org.eclipse.virgo.kernel.test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
import org.eclipse.virgo.nano.core.AbortableSignal;
import org.eclipse.virgo.nano.core.BundleStarter;
import org.junit.Before;
@@ -26,6 +19,10 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
+import java.io.File;
+
+import static org.junit.Assert.*;
+
public class StandardBundleStarterSignallingTests extends AbstractKernelIntegrationTest {
private BundleStarter monitor;
@@ -111,8 +108,7 @@
if (countWaits-- == 0) break;
try {
Thread.sleep(100);
- } catch (InterruptedException e) {
- continue;
+ } catch (InterruptedException ignored) {
}
}
}
@@ -308,15 +304,15 @@
this.aborted = true;
}
- public boolean isComplete() {
+ boolean isComplete() {
return this.complete;
}
- public boolean isAborted() {
+ boolean isAborted() {
return this.aborted;
}
- public Throwable getCause() {
+ Throwable getCause() {
return this.cause;
}
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java
index 90eaa4f..0afbe4a 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/test/StandardKernelIntegrationTests.java
@@ -11,11 +11,17 @@
package org.eclipse.virgo.kernel.test;
-import static org.junit.Assert.assertNotNull;
-
+import org.eclipse.equinox.region.RegionDigraph;
+import org.eclipse.virgo.kernel.services.work.WorkArea;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.virgo.medic.eventlog.EventLoggerFactory;
import org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer;
+import org.eclipse.virgo.repository.Repository;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+import static org.junit.Assert.assertNotNull;
public class StandardKernelIntegrationTests extends AbstractKernelIntegrationTest {
@@ -25,4 +31,39 @@
ServiceReference<ApplicationDeployer> serviceReference = context.getServiceReference(ApplicationDeployer.class);
assertNotNull("Application deployer service was not present", serviceReference);
}
+
+ public void testRepositoryService() {
+ ServiceReference<Repository> serviceReference = context.getServiceReference(Repository.class);
+ assertNotNull("Repository service was not present", serviceReference);
+ }
+
+ @Test
+ public void testDeprecatedPackageAdminService() {
+ ServiceReference<PackageAdmin> serviceReference = context.getServiceReference(PackageAdmin.class);
+ assertNotNull("PackageAdmin service was not present", serviceReference);
+ }
+
+ @Test
+ public void testEventLoggerFactoryService() {
+ ServiceReference<EventLoggerFactory> serviceReference = context.getServiceReference(EventLoggerFactory.class);
+ assertNotNull("EventLoggerFactory service was not present", serviceReference);
+ }
+
+ @Test
+ public void testEventLoggerService() {
+ ServiceReference<EventLogger> serviceReference = context.getServiceReference(EventLogger.class);
+ assertNotNull("EventLogger service was not present", serviceReference);
+ }
+
+ @Test
+ public void testRegionDigraphService() {
+ ServiceReference<RegionDigraph> serviceReference = context.getServiceReference(RegionDigraph.class);
+ assertNotNull("RegionDigraph service was not present", serviceReference);
+ }
+
+ @Test
+ public void testWorkAreaService() {
+ ServiceReference<WorkArea> serviceReference = context.getServiceReference(WorkArea.class);
+ assertNotNull("WorkArea service was not present", serviceReference);
+ }
}
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
index 0888a63..60d5b24 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
@@ -1,23 +1,27 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.virgo.kernel.test;version="3.8.0.BUILD-SNA
- PSHOT";uses:="org.eclipse.virgo.nano.core,org.junit,org.junit.runner"
- ,delay
+Export-Package: delay
Bundle-SymbolicName: org.eclipse.virgo.kernel.test
Bundle-Name: Virgo Kernel Test
Bundle-Version: 3.8.0.BUILD-SNAPSHOT
Bundle-ClassPath: .,SlowService.jar,QuickConsumer.jar,quasi/simpleimpo
rter.jar,quasi/simpleexporter.jar
Bundle-ManifestVersion: 2
-Import-Package: javax.management;version="0",org.eclipse.equinox.regio
- n,org.eclipse.gemini.blueprint.context.support;version="[3.0.0,4)",or
- g.eclipse.gemini.blueprint.service.importer.support;version="[3.0.0,4
- )",org.eclipse.virgo.kernel.osgi.framework;version="[3.8.0,4)",org.ec
- lipse.virgo.kernel.osgi.quasi;version="[3.8.0,4)",org.eclipse.virgo.n
- ano.core;version="[3.8.0,4)",org.eclipse.virgo.nano.deployer.api.core
- ;version="[3.8.0,4)",org.eclipse.virgo.shell.osgicommand.helper,org.e
- clipse.virgo.util.io;version="[3.8.0,4)",org.eclipse.virgo.util.osgi.
- manifest;version="[3.8.0,4)",org.junit;version="[4.7.0,5)",org.junit.
- runner;version="[4.7.0,5)",org.osgi.framework;version="0",org.springf
- ramework.context;version="[5.0.8.RELEASE,6)",org.springframework.jmx.
- export;version="[5.0.8.RELEASE,6)"
+Import-Package: javax.management;version="0",
+ org.osgi.framework;version="0",
+ org.osgi.service.packageadmin,
+ org.eclipse.equinox.region,
+ org.eclipse.virgo.repository;version="[3.8.0,4)",
+ org.eclipse.virgo.medic.eventlog;version="[3.8.0,4)",
+ org.eclipse.virgo.kernel.osgi.framework;version="[3.8.0,4)",
+ org.eclipse.virgo.kernel.osgi.quasi;version="[3.8.0,4)",
+ org.eclipse.virgo.kernel.services.work;version="[3.8.0,4)",
+ org.eclipse.virgo.nano.core;version="[3.8.0,4)",
+ org.eclipse.virgo.nano.deployer.api.core;version="[3.8.0,4)",
+ org.eclipse.virgo.shell.osgicommand.helper,
+ org.eclipse.virgo.util.io;version="[3.8.0,4)",
+ org.eclipse.virgo.util.osgi.manifest;version="[3.8.0,4)",
+ org.junit;version="[4.7.0,5)",
+ org.junit.runner;version="[4.7.0,5)",
+ org.springframework.aop;version="[5.0.8,6)",
+ org.springframework.context;version="[5.0.8,6)"
Tool: Bundlor 1.1.3.M01
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index c2f6808..91fd3d7 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -4,7 +4,7 @@
file:${gradle.cache}/org.slf4j/slf4j-api/${slf4jVersion}/${slf4jApiHash}/slf4j-api-${slf4jVersion}.jar,\
file:${gradle.cache}/org.slf4j/jcl-over-slf4j/${slf4jVersion}/${slf4jJclOverSlf4jHash}/jcl-over-slf4j-${slf4jVersion}.jar@start,\
file:${gradle.cache}/org.slf4j/jul-to-slf4j/${slf4jVersion}/${slf4jJulToSlf4jHash}/jul-to-slf4j-${slf4jVersion}.jar,\
- file:../../ebr/org.aspectj.weaver-${aspectjVersion}/build/org.aspectj.weaver-${aspectjVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.aspectj.weaver_${aspectjVersion}.jar,\
file:../../medic/org.eclipse.virgo.medic.logbackcorefragment/build/libs/org.eclipse.virgo.medic.logbackcorefragment-${version}.jar,\
file:../../medic/org.eclipse.virgo.medic.logbackclassicfragment/build/libs/org.eclipse.virgo.medic.logbackclassicfragment-${version}.jar,\
file:${gradle.cache}/ch.qos.logback/logback-core/${logbackVersion}/${logbackCoreHash}/logback-core-${logbackVersion}.jar,\
@@ -31,20 +31,20 @@
file:../../nano/org.eclipse.virgo.nano.deployer.api/build/libs/org.eclipse.virgo.nano.deployer.api-${version}.jar@start,\
file:../../nano/org.eclipse.virgo.nano.deployer.hot/build/libs/org.eclipse.virgo.nano.deployer.hot-${version}.jar@start,\
file:../../nano/org.eclipse.virgo.nano.management/build/libs/org.eclipse.virgo.nano.management-${version}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/oevm.org.aopalliance/${orgAopAllianceVersion}/${aopAllianceHash}/oevm.org.aopalliance-${orgAopAllianceVersion}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.aop/${springframeworkVersion}/${springAopHash}/org.springframework.aop-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.core/${springframeworkVersion}/${springCoreHash}/org.springframework.core-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.beans/${springframeworkVersion}/${springBeansHash}/org.springframework.beans-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.expression/${springframeworkVersion}/${springExpressionHash}/org.springframework.expression-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.context/${springframeworkVersion}/${springContextHash}/org.springframework.context-${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/build/libs/org.eclipse.virgo.kernel.agent.dm-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.kerneldmfragment/build/libs/org.eclipse.virgo.kernel.kerneldmfragment-${version}.jar,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-io/${geminiBlueprintVersion}/${blueprintIoHash}/gemini-blueprint-io-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-core/${geminiBlueprintVersion}/${blueprintCoreHash}/gemini-blueprint-core-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-extender/${geminiBlueprintVersion}/${blueprintExtenderHash}/gemini-blueprint-extender-${geminiBlueprintVersion}.jar@start,\
- file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcomponentsCoreVersion}.jar@start,\
- file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpcomponentsClientVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.commons.codec/${commonsCodecVersion}/${commonsCodecHash}/org.apache.commons.codec-${commonsCodecVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcoreVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpclientVersion}.jar@start,\
+ file:${gradle.cache}/commons-codec/commons-codec/${commonsCodecVersion}/${commonsCodecHash}/commons-codec-${commonsCodecVersion}.jar@start,\
file:../../repository/org.eclipse.virgo.repository/build/libs/org.eclipse.virgo.repository-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.artifact/build/libs/org.eclipse.virgo.kernel.artifact-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index e1b4615..616d563 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,15 +1,10 @@
gradle.cache = %gradle.cache%
+
version = 3.8.0.BUILD-SNAPSHOT
-orgAopAllianceVersion = 1.0.0
-aopAllianceHash = 112e747528df9af5a40e9a2ba51960309daf58de
+aopallianceVersion = 1.0.0
springframeworkVersion = 5.0.8.RELEASE
-springAopHash = 323910d0bd37c13ff534ef62fba303a9bcef1451
-springBeansHash = bf5fd324c11eb63777f810250cb8c2ea292f9279
-springExpressionHash = 92cc7dd736b78420d7a1bcc76b4946f847b0501
-springContextHash = e84a767d680ba3d4c9dedbf787d32e570bdfc7ff
-springCoreHash = 415c7d22dcab46985f27bbe1ce6de968e073497c
geminiBlueprintVersion = 3.0.0.M01
blueprintIoHash = 4a555fe19c736d7f919114e29f6fc01d4702c8ac
@@ -49,29 +44,17 @@
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.agent.dm/build/libs/org.eclipse.virgo.kernel.agent.dm-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.dmfragment/build/libs/org.eclipse.virgo.kernel.dmfragment-${version}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/oevm.org.aopalliance/${orgAopAllianceVersion}/${aopAllianceHash}/oevm.org.aopalliance-${orgAopAllianceVersion}.jar,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.aop/${springframeworkVersion}/${springAopHash}/org.springframework.aop-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.expression/${springframeworkVersion}/${springExpressionHash}/org.springframework.expression-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.core/${springframeworkVersion}/${springCoreHash}/org.springframework.core-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.beans/${springframeworkVersion}/${springBeansHash}/org.springframework.beans-${springframeworkVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.springframework.context/${springframeworkVersion}/${springContextHash}/org.springframework.context-${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar@start,\
+ file:../../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-io/${geminiBlueprintVersion}/${blueprintIoHash}/gemini-blueprint-io-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-core/${geminiBlueprintVersion}/${blueprintCoreHash}/gemini-blueprint-core-${geminiBlueprintVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.gemini.blueprint/gemini-blueprint-extender/${geminiBlueprintVersion}/${blueprintExtenderHash}/gemini-blueprint-extender-${geminiBlueprintVersion}.jar@start,\
file:../org.eclipse.virgo.kernel.userregion/build/libs/org.eclipse.virgo.kernel.userregion-${version}.jar@start
-# Why not?
-# file:../org.eclipse.virgo.kernel.deployer.dm/build/libs/org.eclipse.virgo.kernel.deployer.dm-${currentVersion}.jar@start,\
-
-# DS
-# file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/${equinoxUtilVersion}/${equinoxUtilHash}/org.eclipse.equinox.util-${equinoxUtilVersion}.jar@start,\
-# file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/${equinoxDsVersion}/${equinoxDsHash}/org.eclipse.equinox.ds-${equinoxDsVersion}.jar@start,\
-
-# file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.1.0.RELEASE/org.springframework.asm-3.1.0.RELEASE.jar,\
-# file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.mina.core/2.0.2.v201108120515/org.apache.mina.core-2.0.2.v201108120515.jar@start,\
-# file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.apache.sshd.core/0.5.0.v201108120515/org.apache.sshd.core-0.5.0.v201108120515.jar@start
-# file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.console.ssh/1.0.0.v20120430-1356/org.eclipse.equinox.console.ssh-1.0.0.v20120430-1356.jar@start,\
-
bundleImports = org.eclipse.osgi;bundle-version="0"
packageImports =\
@@ -108,6 +91,7 @@
org.slf4j.spi;version="[1.6.4,2)",\
org.junit;version="[4.7.0,5.0.0)",\
org.junit.runner;version="[4.7.0,5.0.0)",\
+ org.springframework.lang;version="[5.0.8,6)",\
org.springframework.util;version="[5.0.8,6)"
serviceImports =\
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
index 9c96472..80f6afe 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
@@ -4,13 +4,12 @@
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':repository:org.eclipse.virgo.repository')
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.codec", version: commonsCodecVersion, ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ testImplementation 'org.springframework:spring-beans'
+ testImplementation 'org.springframework:spring-core'
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+ testRuntimeOnly group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion // used in EquinoxOsgiFrameworkTests
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/TestUtils.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/TestUtils.java
new file mode 100644
index 0000000..a49901e
--- /dev/null
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/TestUtils.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.kernel.userregion.internal;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+import static java.nio.file.Files.walk;
+import static org.junit.Assert.fail;
+
+public class TestUtils {
+
+ private static final Path BND_PLATFORM = Paths.get("..", "..", "3rd-party", "build", "plugins");
+
+ public static File fromBndPlatform(String locationInBndPlatform) throws IOException {
+ Path bundlePath = walk(BND_PLATFORM)
+ .filter(s -> s.toString().contains(locationInBndPlatform))
+ .findFirst()
+ .orElseThrow(() -> new IllegalStateException("Failed to locate '" + locationInBndPlatform + "' in " + BND_PLATFORM));
+ return bundlePath.toFile();
+ }
+
+ public static File fromGradleCache(String bundleName, String key) throws IOException {
+ String filename = bundleName + "-" + resolveVersionFromGradleProperties(key) + ".jar";
+ Path gradleFiles = Paths.get(System.getProperty("user.home"),
+ ".gradle", "caches", "modules-2", "files-2.1");
+
+ return walk(gradleFiles)
+ .filter(path -> path.endsWith(filename))
+ .peek(System.out::println)
+ .findFirst().orElseThrow(() -> new IllegalStateException("Failed to find '" + filename + "' in Gradle cache."))
+ .toFile();
+ }
+
+ private static String resolveVersionFromGradleProperties(String libraryName) {
+ String versionString = "unresolved";
+ String gradlePropertiesFile = "../../gradle.properties";
+ try {
+ Properties gradleProperties = new Properties();
+ gradleProperties.load(new FileInputStream(gradlePropertiesFile));
+ if (!gradleProperties.containsKey(libraryName)) {
+ fail("Couldn't resolve '" + libraryName + "' in '" + gradlePropertiesFile + "'.");
+ }
+ return gradleProperties.getProperty(libraryName);
+ } catch (IOException e) {
+ fail("Failed to load '" + gradlePropertiesFile + " ' to get version for '" + libraryName + "'.");
+ }
+ return versionString;
+ }
+}
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
index 3d79d60..695c87b 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
@@ -11,22 +11,20 @@
package org.eclipse.virgo.kernel.userregion.internal.equinox;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.lang.instrument.ClassFileTransformer;
-import java.security.ProtectionDomain;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import org.eclipse.virgo.kernel.osgi.framework.BundleClassLoaderUnavailableException;
+import org.eclipse.virgo.kernel.osgi.framework.InstrumentableClassLoader;
import org.eclipse.virgo.util.osgi.BundleUtils;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
-import org.eclipse.virgo.kernel.osgi.framework.BundleClassLoaderUnavailableException;
-import org.eclipse.virgo.kernel.osgi.framework.InstrumentableClassLoader;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.eclipse.virgo.kernel.userregion.internal.TestUtils.*;
+import static org.junit.Assert.*;
public class EquinoxOsgiFrameworkTests extends AbstractOsgiFrameworkLaunchingTests {
@@ -58,7 +56,7 @@
@Test
public void testLoadClassAndGetClassLoader() throws Exception {
Bundle bundle = installSpringCore(this.framework);
- assertEquals("incorrect bundle loaded", "org.springframework.core", bundle.getSymbolicName());
+ assertEquals("incorrect bundle loaded", "oevm.org.springframework.core", bundle.getSymbolicName());
Class<?> cls = bundle.loadClass("org.springframework.core.SpringVersion");
assertNotNull(cls);
assertTrue(cls.getClassLoader() instanceof KernelBundleClassLoader);
@@ -72,28 +70,19 @@
assertNotNull(bundleClassLoader);
InstrumentableClassLoader icl = (InstrumentableClassLoader) bundleClassLoader;
final AtomicInteger count = new AtomicInteger(0);
- icl.addClassFileTransformer(new ClassFileTransformer() {
-
- public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
- byte[] classfileBuffer) {
- count.incrementAndGet();
- return null;
- }
-
+ icl.addClassFileTransformer((loader, className, classBeingRedefined, protectionDomain, classfileBuffer) -> {
+ count.incrementAndGet();
+ return null;
});
bundle.loadClass("org.springframework.core.SpringVersion");
assertEquals(1, count.get());
}
- private Bundle installSpringCore(EquinoxOsgiFramework osgi) throws BundleException {
- osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.apache.commons.logging/1.2.0/"
- + "16f574f7c054451477d7fc9d1f294e22b70a8eba/org.apache.commons.logging-1.2.0.jar").getAbsolutePath());
- osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.apache.commons.codec/1.10.0/"
- + "8aff50e99bd7e53f8c4f5fe45c2a63f1d47dd19c/org.apache.commons.codec-1.10.0.jar").getAbsolutePath());
- return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/5.0.8.RELEASE"
- + "/415c7d22dcab46985f27bbe1ce6de968e073497c/org.springframework.core-5.0.8.RELEASE.jar").getAbsolutePath());
+ private Bundle installSpringCore(EquinoxOsgiFramework osgi) throws BundleException, IOException {
+ osgi.getBundleContext().installBundle("file:///" + fromGradleCache("slf4j-api", "slf4jVersion").getAbsolutePath());
+ osgi.getBundleContext().installBundle("file:///" + fromGradleCache("slf4j-nop", "slf4jVersion").getAbsolutePath());
+ osgi.getBundleContext().installBundle("file:///" + fromGradleCache("jcl-over-slf4j", "slf4jVersion").getAbsolutePath()).start();
+
+ return osgi.getBundleContext().installBundle("file:///" + fromBndPlatform("oevm.org.springframework.core").getAbsolutePath());
}
}
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TestUtils.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TestUtils.java
deleted file mode 100644
index 00e7d6c..0000000
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TestUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.kernel.userregion.internal.equinox;
-
-import java.io.File;
-
-/**
- */
-public class TestUtils {
-
- public static boolean deleteRecursively(File root) {
- if (root.exists()) {
- if (root.isDirectory()) {
- File[] children = root.listFiles();
- if (children == null) {
- throw new IllegalStateException("Failed to list files in '" + root + "'.");
- }
- for (File file : children) {
- deleteRecursively(file);
- }
- }
- return root.delete();
- }
- return false;
- }
-}
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
index b76d4f6..c0aa10f 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
@@ -11,26 +11,6 @@
package org.eclipse.virgo.kernel.userregion.internal.importexpansion;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.eclipse.virgo.kernel.artifact.bundle.BundleBridge;
import org.eclipse.virgo.kernel.artifact.library.LibraryBridge;
import org.eclipse.virgo.kernel.osgi.framework.UnableToSatisfyBundleDependenciesException;
@@ -38,23 +18,26 @@
import org.eclipse.virgo.kernel.userregion.internal.equinox.StubHashGenerator;
import org.eclipse.virgo.medic.test.eventlog.LoggedEvent;
import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.repository.ArtifactDescriptor;
-import org.eclipse.virgo.repository.ArtifactGenerationException;
-import org.eclipse.virgo.repository.Attribute;
-import org.eclipse.virgo.repository.Query;
-import org.eclipse.virgo.repository.Repository;
-import org.eclipse.virgo.repository.RepositoryAwareArtifactDescriptor;
-import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
-import org.eclipse.virgo.util.osgi.manifest.BundleManifestFactory;
-import org.eclipse.virgo.util.osgi.manifest.ImportedBundle;
-import org.eclipse.virgo.util.osgi.manifest.ImportedLibrary;
-import org.eclipse.virgo.util.osgi.manifest.ImportedPackage;
-import org.eclipse.virgo.util.osgi.manifest.Resolution;
-import org.eclipse.virgo.util.osgi.manifest.VersionRange;
+import org.eclipse.virgo.repository.*;
+import org.eclipse.virgo.util.osgi.manifest.*;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Version;
+import org.springframework.core.io.FileSystemResource;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.easymock.EasyMock.*;
+import static org.eclipse.virgo.kernel.userregion.internal.TestUtils.fromBndPlatform;
+import static org.junit.Assert.*;
+import static org.springframework.core.io.support.PropertiesLoaderUtils.loadProperties;
public class ImportExpansionHandlerTests {
@@ -69,16 +52,16 @@
}
@Before
- public void populateRepository() throws ArtifactGenerationException {
+ public void populateRepository() throws ArtifactGenerationException, IOException {
BundleBridge bundleBridge = new BundleBridge(new StubHashGenerator());
LibraryBridge libraryBridge = new LibraryBridge(new StubHashGenerator());
- this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/5.0.8.RELEASE"
- + "/415c7d22dcab46985f27bbe1ce6de968e073497c/org.springframework.core-5.0.8.RELEASE.jar")));
- this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.beans/5.0.8.RELEASE"
- + "/bf5fd324c11eb63777f810250cb8c2ea292f9279/org.springframework.beans-5.0.8.RELEASE.jar")));
+ Properties gradleProperties = loadProperties(new FileSystemResource("../../gradle.properties"));
+
+ this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(fromBndPlatform("oevm.org.springframework.core_" +
+ gradleProperties.getProperty("springframeworkVersion") + ".jar")));
+ this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(fromBndPlatform("oevm.org.springframework.beans_" +
+ gradleProperties.getProperty("springframeworkVersion") + ".jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentOne")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentTwo")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentThree")));
@@ -97,7 +80,7 @@
List<Object> mocks = new ArrayList<>();
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
- expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
+ expect(bundleImport.getBundleSymbolicName()).andReturn("oevm.org.springframework.core").atLeastOnce();
expect(bundleImport.getVersion()).andReturn(new VersionRange("[5,6)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
@@ -117,7 +100,7 @@
List<ImportedPackage> packageImports = bundleManifest.getImportPackage().getImportedPackages();
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
- assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
+ assertEquals("oevm.org.springframework.core", attributes.get("bundle-symbolic-name"));
assertEquals(new VersionRange("[5.0.8.RELEASE,5.0.8.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -139,7 +122,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
verifyMocks(mocks);
@@ -149,13 +132,12 @@
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
if (packageImport.getPackageName().startsWith("org.springframework.beans")) {
- assertEquals("org.springframework.beans", attributes.get("bundle-symbolic-name"));
+ assertEquals("oevm.org.springframework.beans", attributes.get("bundle-symbolic-name"));
} else {
- assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
+ assertEquals("oevm.org.springframework.core", attributes.get("bundle-symbolic-name"));
}
assertEquals(new VersionRange("[5.0.8.RELEASE,5.0.8.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
-
}
@Test
@@ -174,7 +156,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -203,7 +185,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
}
@@ -224,7 +206,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -256,7 +238,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
"Manifest-Version: 1.0\nBundle-SymbolicName: test.bundle"));
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
}
@Test
@@ -275,7 +257,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -300,7 +282,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
verifyMocks(mocks);
@@ -324,7 +306,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
}
/**
@@ -346,7 +328,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
verifyMocks(mocks);
@@ -373,7 +355,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(libraryImport1, libraryImport2), asList(new ImportedBundle[0]),
+ handler.expandImports(asList(libraryImport1, libraryImport2), emptyList(),
bundleManifest);
}
@@ -396,7 +378,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(libraryImport1, libraryImport2), asList(new ImportedBundle[0]),
+ handler.expandImports(asList(libraryImport1, libraryImport2), emptyList(),
bundleManifest);
}
@@ -415,7 +397,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
"Bundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[1,2]\""));
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
}
@Test(expected = UnableToSatisfyDependenciesException.class)
@@ -435,7 +417,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
"Bundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[1,2]\""));
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
}
@Test
@@ -443,7 +425,7 @@
List<Object> mocks = new ArrayList<>();
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
- expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
+ expect(bundleImport.getBundleSymbolicName()).andReturn("oevm.org.springframework.core").atLeastOnce();
expect(bundleImport.getVersion()).andReturn(new VersionRange("[5,6)")).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false);
@@ -454,7 +436,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
"Manifest-Version: 1.0, Bundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[4.5,4.6)\""));
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -475,7 +457,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
"Manifest-Version: 1.0\nBundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[4.5,4.6)\""));
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
verifyMocks(mocks);
@@ -504,7 +486,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), asList(bundleImport1, bundleImport2),
+ handler.expandImports(emptyList(), asList(bundleImport1, bundleImport2),
bundleManifest);
}
@@ -513,7 +495,7 @@
List<Object> mocks = new ArrayList<>();
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
- expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
+ expect(bundleImport.getBundleSymbolicName()).andReturn("oevm.org.springframework.core").atLeastOnce();
expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.0.8,6)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
@@ -548,7 +530,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
}
@Test
@@ -572,7 +554,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]),
+ handler.expandImports(emptyList(),
asList(hostImportedBundle, fragmentImportedBundle), bundleManifest);
assertEquals(0, bundleManifest.getImportPackage().getImportedPackages().size());
}
@@ -635,7 +617,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
+ handler.expandImports(singletonList(libraryImport), emptyList(), bundleManifest);
verifyMocks(mocks);
@@ -658,7 +640,7 @@
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest();
- handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
+ handler.expandImports(emptyList(), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -710,23 +692,17 @@
private final List<RepositoryAwareArtifactDescriptor> artifactDescriptors = new ArrayList<>();
- /**
- * {@inheritDoc}
- */
+ @Override
public Query createQuery(String key, String value) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Query createQuery(String key, String value, Map<String, Set<String>> properties) {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public RepositoryAwareArtifactDescriptor get(String type, String name, VersionRange versionRange) {
RepositoryAwareArtifactDescriptor bestMatch = null;
@@ -740,16 +716,12 @@
return bestMatch;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getName() {
throw new UnsupportedOperationException();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void stop() {
throw new UnsupportedOperationException();
}
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
index 5018fac..5ecf6a4 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
@@ -1,4 +1,4 @@
Library-SymbolicName: org.springframework
Library-Version: 5.0.8
-Import-Bundle: org.springframework.core;version="[5.0.8.RELEASE,5.0.8.RELEASE]",
- org.springframework.beans;version="[5.0.8.RELEASE,5.0.8.RELEASE]"
+Import-Bundle: oevm.org.springframework.core;version="[5.0.8.RELEASE,5.0.8.RELEASE]",
+ oevm.org.springframework.beans;version="[5.0.8.RELEASE,5.0.8.RELEASE]"
diff --git a/kernel/org.eclipse.virgo.management.console/build.gradle b/kernel/org.eclipse.virgo.management.console/build.gradle
index 4132896..6d6ffbe 100644
--- a/kernel/org.eclipse.virgo.management.console/build.gradle
+++ b/kernel/org.eclipse.virgo.management.console/build.gradle
@@ -16,10 +16,9 @@
testCompile group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion,ext: "jar"
+ testImplementation 'org.springframework:spring-core'
+ testImplementation 'org.springframework:spring-web'
+ testImplementation 'org.springframework:spring-test'
testCompile group: "org.eclipse.virgo.mirrored", name: "org.mozilla.javascript", version: mozillaJavascriptVersion, configuration: "compile", ext: "jar"
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
testCompile group: "commons-io", name: "commons-io", version: commonsIoVersion, ext: "jar"
}
diff --git a/kernel/org.eclipse.virgo.shell.command/build.gradle b/kernel/org.eclipse.virgo.shell.command/build.gradle
index 586e7a3..82178cd 100644
--- a/kernel/org.eclipse.virgo.shell.command/build.gradle
+++ b/kernel/org.eclipse.virgo.shell.command/build.gradle
@@ -13,7 +13,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-core'
compile project(':kernel:org.eclipse.virgo.kernel.deployer')
compile project(':kernel:org.eclipse.virgo.kernel.model')
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 9eb8fa1..5d1ec9e 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -39,6 +39,7 @@
}
dependencies {
+
localPlugin project(':kernel:org.eclipse.virgo.kernel.agent.dm')
localPlugin project(':kernel:org.eclipse.virgo.kernel.artifact')
localPlugin project(':kernel:org.eclipse.virgo.kernel.deployer')
@@ -70,12 +71,10 @@
localPlugin project(':nano:org.eclipse.virgo.nano.services.ds')
localPlugin project(':repository:org.eclipse.virgo.repository')
- // TODO - review if all those signedExternalPlugins are signed
- signedExternalPlugin group: 'org.eclipse.virgo.mirrored', name: 'org.apache.commons.codec', version: commonsCodecVersion, ext: "jar"
- // optional requirement for org.springframework.core
+ signedExternalPlugin 'commons-codec:commons-codec'
- externalPlugin files("../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcomponentsCoreVersion}.jar")
- externalPlugin files("../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpcomponentsClientVersion}.jar")
+ externalPlugin files("../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpcore_${httpcoreVersion}.jar")
+ externalPlugin files("../3rd-party/build/plugins/oevm.org.apache.httpcomponents.httpclient_${httpclientVersion}.jar")
localPlugin project(':util:org.eclipse.virgo.util.common')
localPlugin project(':util:org.eclipse.virgo.util.env')
@@ -120,7 +119,7 @@
signedExternalPlugin group: "org.slf4j", name: "jcl-over-slf4j", version: slf4jVersion
signedExternalPlugin group: "org.slf4j", name: "log4j-over-slf4j", version: slf4jVersion
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.aspectj.weaver", version: aspectjVersion, ext: "jar"
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.aspectj.weaver_${aspectjVersion}.jar")
localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.region.feature')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
@@ -151,7 +150,7 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration.feature')
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar")
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.management.feature')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "osgi.enterprise", version: osgiEnterpriseVersion, configuration: "compile", ext: "jar"
@@ -182,11 +181,14 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.frameworkadmin.equinox", version: equinoxFrameworkadminEquinoxVersion, configuration: "compile", ext: "jar"
localFeature project(':org.eclipse.virgo.site:org.eclipse.gemini.blueprint.feature')
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar")
+
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar")
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar")
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar")
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar")
+ signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar")
+
signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
@@ -258,7 +260,7 @@
signedExternalPlugin group: "javax.transaction", name: "javax.transaction-api", version: javaxTransactionVersion
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.annotation", version: javaxAnnotationVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.ejb", version: javaxEjbVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
+ signedExternalPlugin 'org.glassfish.hk2.external:javax.inject'
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.jms", version: javaxJmsVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.resource", version: javaxResourceVersion, configuration: "compile", ext: "jar"
@@ -280,7 +282,7 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.specs.osgi.registry", version: geronimoSpecsOsgiRegistryVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.beanutils", version: commonsBeanutilsVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.commons.cli", version: commonsCliVersion, ext: "jar"
+ signedExternalPlugin 'commons-cli:commons-cli'
signedExternalPlugin group: "commons-collections", name: "commons-collections", version: commonsCollectionsVersion
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.lang", version: commonsLangVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.dbcp", version: commonsDbcpVersion, configuration: "compile", ext: "jar"
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
index 5885ac4..05f6c7c 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml
index e206df0..aeee363 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml
@@ -19,7 +19,7 @@
</license>
<plugin
- id="org.springframework.expression"
+ id="oevm.org.springframework.expression"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/packaging/build.gradle b/packaging/build.gradle
index 82594b5..7553c0c 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -54,16 +54,16 @@
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.util", version: equinoxUtilVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.codec", version: commonsCodecVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
+ repositoryExt files("../../3rd-party/build/plugins/oevm.aopalliance.aopalliance_${aopallianceVersion}.jar")
+ repositoryExt 'commons-codec:commons-codec'
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.aop_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.beans_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.context_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar")
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "com.squareup.okio", version: okioVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "com.squareup.okhttp3", version: okhttp3Version, ext: "jar"
+ repositoryExt files("../../3rd-party/build/plugins/oevm.com.squareup.okio_${okioVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.com.squareup.okhttp3_${okhttp3Version}.jar")
repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
@@ -100,22 +100,23 @@
repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
// missing Spring Framework dependencies
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.aspects", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.context.support", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.jdbc", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.messaging", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.jms", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.orm", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.oxm", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.transaction", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.webflux", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.webmvc", version: springframeworkVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.springframework.websocket", version: springframeworkVersion, ext: "jar"
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.aspects_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.context.support_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.jdbc_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.messaging_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.jms_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.orm_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.oxm_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.tx_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.web_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.webflux_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.webmvc_${springframeworkVersion}.jar")
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.springframework.websocket_${springframeworkVersion}.jar")
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.aspectj.weaver", version: aspectjVersion, ext: "jar"
+ repositoryExt files("../../3rd-party/build/plugins/oevm.org.aspectj.weaver_${aspectjVersion}.jar")
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "oevm.javax.portlet", version: javaxPortletVersion, ext: "jar"
+ // TODO - think about removing portlet-api from standard VTS
+ repositoryExt 'javax.portlet:portlet-api:3.0.1'
repositoryExt group: "javax.servlet.jsp.jstl", name: "javax.servlet.jsp.jstl-api", version: javaxServletJspJstlApiVersion
repositoryExt group: "org.glassfish.web", name: "javax.servlet.jsp.jstl", version: javaxServletJspJstlImplVersion
@@ -149,7 +150,8 @@
repositoryExt group: "commons-io", name: "commons-io", version: commonsIoVersion, ext: "jar"
repositoryExt group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
- repositoryExt group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.taglibs.standard", version: apacheTaglibsStandardVersion, ext: "jar"
+ // TODO - Equinox migration - rethink removal of taglibs.standard
+// repositoryExt group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.taglibs.standard", version: apacheTaglibsStandardVersion, ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
repositoryExt group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
repositoryExt group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
diff --git a/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle b/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
index 510884f..dea900a 100644
--- a/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
+++ b/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
@@ -29,8 +29,6 @@
}
dependencies {
- testImplementation 'junit:junit'
-
testImplementation project(':test:org.eclipse.virgo.test.tools')
testImplementation project(':util:org.eclipse.virgo.util.io')
diff --git a/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index aac3f01..5457763 100644
--- a/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/packaging/kernel/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -47,6 +47,7 @@
org.slf4j;version="[1.6.4,2)",\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
+ org.springframework.lang;version="[5.0.8,6)",\
org.springframework.util;version="[5.0.8,6)"
serviceImports =\
diff --git a/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle b/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
index 3da0ff0..634ac7f 100644
--- a/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
+++ b/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
@@ -30,8 +30,6 @@
}
dependencies {
- testImplementation 'junit:junit'
-
testImplementation project(':test:org.eclipse.virgo.test.tools')
testImplementation project(':util:org.eclipse.virgo.util.io')
diff --git a/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle b/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
index 19cc993..e231bae 100644
--- a/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
+++ b/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
@@ -29,8 +29,6 @@
}
dependencies {
- testImplementation 'junit:junit'
-
testImplementation project(':test:org.eclipse.virgo.test.tools')
testImplementation project(':util:org.eclipse.virgo.util.io')
diff --git a/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
index 6575286..d2088a5 100644
--- a/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/packaging/tomcat-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -45,6 +45,7 @@
org.slf4j;version="[1.6.4,2)",\
org.slf4j.helpers;version="[1.6.4,2)",\
org.slf4j.spi;version="[1.6.4,2)",\
+ org.springframework.lang;version="[5.0.8,6)",\
org.springframework.util;version="[5.0.8,6)"
serviceImports =\
diff --git a/repository/org.eclipse.virgo.repository/build.gradle b/repository/org.eclipse.virgo.repository/build.gradle
index 92c470a..b9333ca 100644
--- a/repository/org.eclipse.virgo.repository/build.gradle
+++ b/repository/org.eclipse.virgo.repository/build.gradle
@@ -4,7 +4,7 @@
compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- implementation "org.apache.httpcomponents:httpclient:${httpcomponentsClientVersion}"
+ implementation "org.apache.httpcomponents:httpclient:${httpclientVersion}"
implementation project(':util:org.eclipse.virgo.util.common')
implementation project(':util:org.eclipse.virgo.util.io')
@@ -18,8 +18,6 @@
testImplementation project(':medic:org.eclipse.virgo.medic.test')
testImplementation project(':test:org.eclipse.virgo.test.stubs')
-
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.codec", version: commonsCodecVersion, ext: "jar"
}
eclipse.classpath {
diff --git a/run_virgo_for_apache_tomcat.sh b/run_virgo_for_apache_tomcat.sh
new file mode 100755
index 0000000..c4a712a
--- /dev/null
+++ b/run_virgo_for_apache_tomcat.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+./gradlew -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true packaging:tomcat-server:installDist -x test
+
+cd packaging/tomcat-server/build/install/virgo-tomcat-server || exit
+./bin/startup.sh
diff --git a/run_virgo_kernel.sh b/run_virgo_kernel.sh
new file mode 100755
index 0000000..b4dc176
--- /dev/null
+++ b/run_virgo_kernel.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+./gradlew -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true packaging:kernel:installDist -x test
+
+cd packaging/kernel/build/install/virgo-kernel || exit
+./bin/startup.sh
diff --git a/test/org.eclipse.virgo.test.framework/build.gradle b/test/org.eclipse.virgo.test.framework/build.gradle
index fc04952..b5cd4f4 100644
--- a/test/org.eclipse.virgo.test.framework/build.gradle
+++ b/test/org.eclipse.virgo.test.framework/build.gradle
@@ -1,6 +1,7 @@
dependencies {
+ implementation 'junit:junit'
+
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- testCompile group: 'junit', name: 'junit', version: junitVersion, configuration: "compile", ext: "jar"
compile project(':util:org.eclipse.virgo.util.common')
compile project(':util:org.eclipse.virgo.util.parser.launcher')
diff --git a/test/org.eclipse.virgo.test.stubs/build.gradle b/test/org.eclipse.virgo.test.stubs/build.gradle
index f0d69fc..34905dd 100644
--- a/test/org.eclipse.virgo.test.stubs/build.gradle
+++ b/test/org.eclipse.virgo.test.stubs/build.gradle
@@ -5,5 +5,5 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
- compile group: 'junit', name: 'junit', version: junitVersion, configuration: "compile", ext: "jar"
+ implementation 'junit:junit'
}
diff --git a/test/org.eclipse.virgo.test.test/build.gradle b/test/org.eclipse.virgo.test.test/build.gradle
index 2021275..a348416 100644
--- a/test/org.eclipse.virgo.test.test/build.gradle
+++ b/test/org.eclipse.virgo.test.test/build.gradle
@@ -1,8 +1,14 @@
+apply plugin: 'idea'
+idea {
+ module {
+ inheritOutputDirs = true
+ }
+}
+
task copyTestResources(type: Copy) {
from "${projectDir}/src/test/resources"
into "${buildDir}/classes/java/test"
}
-
processTestResources.dependsOn copyTestResources
dependencies {
diff --git a/test/org.eclipse.virgo.test.tools/build.gradle b/test/org.eclipse.virgo.test.tools/build.gradle
index 4223f13..f8ebbfe 100644
--- a/test/org.eclipse.virgo.test.tools/build.gradle
+++ b/test/org.eclipse.virgo.test.tools/build.gradle
@@ -1,7 +1,7 @@
dependencies {
- compile group: 'junit', name: 'junit', version: junitVersion, configuration: "compile", ext: "jar"
+ implementation 'junit:junit'
compile project(':util:org.eclipse.virgo.util.io')
- compile group: "org.apache.httpcomponents", name: "httpcore", version: httpcomponentsCoreVersion
- compile group: "org.apache.httpcomponents", name: "httpclient", version: httpcomponentsClientVersion
+ compile group: "org.apache.httpcomponents", name: "httpcore", version: httpcoreVersion
+ compile group: "org.apache.httpcomponents", name: "httpclient", version: httpclientVersion
}
diff --git a/util/org.eclipse.virgo.util.integrationtest/build.gradle b/util/org.eclipse.virgo.util.integrationtest/build.gradle
index 543d303..f79922b 100644
--- a/util/org.eclipse.virgo.util.integrationtest/build.gradle
+++ b/util/org.eclipse.virgo.util.integrationtest/build.gradle
@@ -4,7 +4,7 @@
dependencies {
// OSGi runtime
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ testImplementation group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
testRuntime project(':util:org.eclipse.virgo.util.common')
testRuntime project(':util:org.eclipse.virgo.util.env')
diff --git a/util/org.eclipse.virgo.util.osgi/src/main/java/org/eclipse/virgo/util/osgi/BundleUtils.java b/util/org.eclipse.virgo.util.osgi/src/main/java/org/eclipse/virgo/util/osgi/BundleUtils.java
index ea978e0..928cbd9 100644
--- a/util/org.eclipse.virgo.util.osgi/src/main/java/org/eclipse/virgo/util/osgi/BundleUtils.java
+++ b/util/org.eclipse.virgo.util.osgi/src/main/java/org/eclipse/virgo/util/osgi/BundleUtils.java
@@ -11,7 +11,6 @@
package org.eclipse.virgo.util.osgi;
-import org.eclipse.osgi.framework.internal.core.Constants;
import org.osgi.framework.Bundle;
import org.osgi.framework.wiring.*;
import org.osgi.framework.BundleContext;
diff --git a/util/org.eclipse.virgo.util.parser.launcher/src/test/java/org/eclipse/virgo/util/parser/launcher/ArgumentParserTests.java b/util/org.eclipse.virgo.util.parser.launcher/src/test/java/org/eclipse/virgo/util/parser/launcher/ArgumentParserTests.java
index c74d0e9..86c6ea1 100644
--- a/util/org.eclipse.virgo.util.parser.launcher/src/test/java/org/eclipse/virgo/util/parser/launcher/ArgumentParserTests.java
+++ b/util/org.eclipse.virgo.util.parser.launcher/src/test/java/org/eclipse/virgo/util/parser/launcher/ArgumentParserTests.java
@@ -58,7 +58,7 @@
@Test
public void testGradleCachePlaceholderSubstitution() {
- String commandLine = "-B%gradle.cache%/junit/junit/4.7/d9444742a5b897c6280724a49f57a8155517d21f/junit-4.7.jar";
+ String commandLine = "-B%gradle.cache%/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar";
LaunchCommand command = parse(commandLine);
BundleEntry[] bundleDeclarations = command.getBundleEntries();
@@ -67,15 +67,14 @@
BundleEntry bd = bundleDeclarations[0];
assertFalse(bd.isAutoStart());
- assertEquals(new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/junit/junit/4.7/d9444742a5b897c6280724a49f57a8155517d21f/junit-4.7.jar").toURI(), bd.getURI());
+ assertEquals(new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar").toURI(), bd.getURI());
}
-
+
@Test(expected=ParseException.class)
public void testParseRelativeFileBundleEntryNotExists() {
String commandLine = "-B/src/test/resources/test-bundleoeuoeu@start";
parse(commandLine);
}
-
@Test
public void testParseAbsoluteFileBundleEntry() {
diff --git a/web/org.eclipse.virgo.web.core/build.gradle b/web/org.eclipse.virgo.web.core/build.gradle
index b41318c..22df320 100644
--- a/web/org.eclipse.virgo.web.core/build.gradle
+++ b/web/org.eclipse.virgo.web.core/build.gradle
@@ -22,7 +22,7 @@
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion,ext: "jar"
+ testImplementation 'org.springframework:spring-test'
testImplementation project(':util:org.eclipse.virgo.util.parser.manifest')
testImplementation project(':kernel:org.eclipse.virgo.kernel.stubs')
diff --git a/web/org.eclipse.virgo.web.dm/build.gradle b/web/org.eclipse.virgo.web.dm/build.gradle
index d1815c4..96d7f81 100644
--- a/web/org.eclipse.virgo.web.dm/build.gradle
+++ b/web/org.eclipse.virgo.web.dm/build.gradle
@@ -11,15 +11,16 @@
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, ext: "jar"
+ implementation 'org.springframework:spring-aop'
+ implementation 'org.springframework:spring-beans'
+ implementation 'org.springframework:spring-context'
+ implementation 'org.springframework:spring-core'
+ implementation 'org.springframework:spring-web'
implementation project(':medic:org.eclipse.virgo.medic')
implementation project(':nano:org.eclipse.virgo.nano.core')
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion,ext: "jar"
+
+ testImplementation 'org.springframework:spring-test'
}
diff --git a/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle b/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
index 50b02c8..02769ba 100644
--- a/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.openejb.jpa.integration/build.gradle
@@ -3,5 +3,6 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.core", version: eclipsePersistenceCoreVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.core", version: apacheOpenejbCoreVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.loader", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "oevm.org.hibernate", version: hibernateVersion, ext: "jar"
+
+ implementation 'org.hibernate:hibernate-core:4.1.0.Final'
}
