490133: Integration of sonatype OSS deployment configuration (https://bugs.eclipse.org/bugs/show_bug.cgi?id=490133)
Removed internal provisioning of equinox OSGi runtime in favor
of a dependency to the version provided by BIRT. Otherwise,
there would be an unresolvable dependency in the
test artifact, and the deployment would attempt
to deploy the equinox framework.
diff --git a/lib/equinox/lib/org.eclipse.osgi.source_3.9.1.v20140110-1610.jar b/lib/equinox/lib/org.eclipse.osgi.source_3.9.1.v20140110-1610.jar
deleted file mode 100644
index fcbe399..0000000
--- a/lib/equinox/lib/org.eclipse.osgi.source_3.9.1.v20140110-1610.jar
+++ /dev/null
Binary files differ
diff --git a/lib/equinox/lib/org.eclipse.osgi_3.9.1.v20140110-1610.jar b/lib/equinox/lib/org.eclipse.osgi_3.9.1.v20140110-1610.jar
deleted file mode 100644
index fd5c07e..0000000
--- a/lib/equinox/lib/org.eclipse.osgi_3.9.1.v20140110-1610.jar
+++ /dev/null
Binary files differ
diff --git a/lib/equinox/pom.xml b/lib/equinox/pom.xml
deleted file mode 100644
index 0b7a54c..0000000
--- a/lib/equinox/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>gemini-blueprint</artifactId>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.9.1.v20140110-1610-SNAPSHOT</version>
- <packaging>pom</packaging>
- <description>
- 3.9.1.v20140110-1610 Version of Eclipse Equinox. Repackaged to be available in local maven repo.
- </description>
-
- <properties>
- <!-- already contains proper manifests -->
- <bundlor.enabled>false</bundlor.enabled>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.9.1.v20140110-1610</version>
- <packaging>jar</packaging>
- <updateReleaseInfo>true</updateReleaseInfo>
- <file>${project.basedir}/lib/org.eclipse.osgi_3.9.1.v20140110-1610.jar</file>
- <sources>${project.basedir}/lib/org.eclipse.osgi.source_3.9.1.v20140110-1610.jar</sources>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>install-file</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/lib/readme.txt b/lib/readme.txt
deleted file mode 100644
index e6d60b2..0000000
--- a/lib/readme.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-The following libraries are used by the Gemini Blueprint distribution either for building
-or running the framework and its samples.
-
-Most (if not all) libraries are available from SpringSource Enterprise Bundle Repository:
-http://www.springsource.com/repository/app/
-
-Note that each
-of these libraries is subject to the respective license; check the respective project
-distribution/website before using any of them in your own applications.
-
-* aopalliance.jar
-- AOP Alliance 1.0 (http://aopalliance.sourceforge.net)
-- required for building the framework
-
-* asm.jar
-- ObjectWeb ASM bytecode library 2.2.3 (http://asm.objectweb.org)
-- required for building the testing framework
-- required for running the framework's test suite
-
-* cglib-2.2.0.jar
-- CGLIB 2.2.0 with ObjectWeb ASM 2.2.3 (http://cglib.sourceforge.net)
-- required at runtime when proxying full target classes via Spring AOP
-
-* easymock.jar
-- EasyMock 1.2 (JDK 1.3 version) (http://www.easymock.org)
-- required for building and running the framework's test suite
-
-* framework.jar
-- Knopflerfish 3.x OSGi platform implementation (http://www.knopflerfish.org)
-- required for building and running the framework's test suite
-
-* jcl-over-slf4j.jar
-- SLF4J 1.6.4 Jakarta Commons Logging wrapper (http://www.slf4j.org)
-- required for building and running the framework's test suite
-
-* junit-4.9.0.jar
-- JUnit 4.9.0 (http://www.junit.org)
-- required for building and running the framework's test suite
-
-* log4j-1.2.16.jar
-- Log4J 1.2.16 (http://logging.apache.org/log4j)
-- required for building running the framework's test suite
-
-* multithreadedtc.jar
-- MultithreadedTC framework 1.01 (http://code.google.com/p/multithreadedtc)
-- required for running the framework's test suite
-
-* org.apache.felix.main.jar
-- Apache Felix 2.x OSGi platform implementation (http://felix.apache.org)
-- required for building and running the framework's test suite
-
-* org.eclipse.osgi.jar
-- Eclipse Equinox 3.5.x OSGi platform implementation (http://www.eclipse.org/equinox)
-- required for building and running the framework's test suite
-
-* osgi_R4_compendium.jar
-- OSGi Compendium API 1.0 (http://www.osgi.org)
-- required for building and running the framework's test suite
-
-* slf4j-api.jar
-- SLF4J API 1.6.4 (http://www.slf4j.org)
-- required for building and running the framework's test suite
-
-* slf4j-log4j.jar
-- SLF4J 1.6.4 adapter for log4j (http://www.slf4j.org)
-- required for running the framework's test suite
-
-* spring-aop.jar
-- Spring Framework 3.0.x AOP library (http://www.springframework.org)
-- required for building and running the framework's test suite
-
-* spring-beans.jar
-- Spring Framework 3.0.x beans library (http://www.springframework.org)
-- required for building and running the framework's test suite
-
-* spring-context.jar
-- Spring Framework 3.0.x context library (http://www.springframework.org)
-- required for building and running the framework's test suite
-
-* spring-context-support.jar
-- Spring Framework 3.0.x context support library (http://www.springframework.org)
-- required for building and running the framework's test suite
-
-* spring-core.jar
-- Spring Framework 3.0.x core library (http://www.springframework.org)
-- required for building and running the framework's test suite
-
-* spring-test.jar
-- Spring Framework 3.0.x test library (http://www.springframework.org)
-- required for building and running the framework's test suite
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c7e91b6..7128596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<osgi.ver>5.0.0</osgi.ver>
<!-- platform versions -->
<!-- equinox - repackaged in ${basedir}/lib/equinox -->
- <equinox.ver>3.9.1.v20140110-1610</equinox.ver>
+ <equinox.ver>3.9.1.v20130814-1242</equinox.ver>
<!-- Knopflerfish -->
<kf.ver>7.1.2</kf.ver>
<!-- Felix 4.4.x supports OSGi R5 -->
@@ -175,7 +175,6 @@
<!-- modules for Spring-OSGi -->
<modules>
- <module>lib/equinox</module>
<module>mock</module>
<module>io</module>
<module>core</module>
@@ -274,7 +273,7 @@
</dependency>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
+ <groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.ver}</version>
</dependency>
@@ -837,8 +836,9 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
+ <groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.osgi</artifactId>
+ <version>${equinox.ver}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index fc38231..abc8410 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -73,7 +73,7 @@
</dependency>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
+ <groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
<optional>true</optional>
