Merge branch 'release-2.x' into build
diff --git a/changelog.txt b/changelog.txt
index 8e5a372..e69dcc8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,17 @@
==================================
http://www.eclipse.org/gemini/blueprint
+
+Changes in version 2.0.0.RELEASE (2016-03-15)
+-----------------------------------------
+
+General:
+* Bug 488009 - Update to Spring 4.2.x
+* Bug 403998 - Upgrade to recent mocking and verification tools and refactor test cases accordingly
+* Bug 489622 - Use the PackageAdmin service instead of the FrameworkUtil to obtain bundle references
+* Bug 489623 - Update to R5 compliant framework versions
+* Bug 489688 - BlueprintCustomCollectionEditor fails to convert non-collection values, but must accept them
+
Changes in version 2.0.0.M02 (2013-03-20)
-----------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index ae90445..3d88781 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/src/main/java/org/eclipse/gemini/blueprint/config/internal/CollectionBeanDefinitionParser.java b/core/src/main/java/org/eclipse/gemini/blueprint/config/internal/CollectionBeanDefinitionParser.java
index a48ef6a..679455d 100644
--- a/core/src/main/java/org/eclipse/gemini/blueprint/config/internal/CollectionBeanDefinitionParser.java
+++ b/core/src/main/java/org/eclipse/gemini/blueprint/config/internal/CollectionBeanDefinitionParser.java
@@ -15,6 +15,7 @@
package org.eclipse.gemini.blueprint.config.internal;
import java.util.Comparator;
+import java.util.Locale;
import org.eclipse.gemini.blueprint.config.internal.util.AttributeCallback;
import org.eclipse.gemini.blueprint.config.internal.util.ParserUtils;
diff --git a/docs/pom.xml b/docs/pom.xml
index 445f301..e6a6c4e 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
<packaging>pom</packaging>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<name>Eclipse Gemini Blueprint</name>
<url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -101,13 +101,6 @@
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>agilejava</id>
- <url>http://agilejava.com/maven/</url>
- </pluginRepository>
- </pluginRepositories>
-
<distributionManagement>
<downloadUrl>http://www.eclipse.org/gemini/blueprint/download/</downloadUrl>
<site>
diff --git a/docs/src/docbkx/faq.xml b/docs/src/docbkx/faq.xml
index 9d9ee9c..41b4d23 100644
--- a/docs/src/docbkx/faq.xml
+++ b/docs/src/docbkx/faq.xml
@@ -82,7 +82,7 @@
<section id="requirements">
<title>What are Gemini Blueprint requirements?</title>
<para>
- Gemini Blueprint requires at least Java 1.5, OSGi 4.1 and Spring 3.0.
+ Gemini Blueprint requires at least Java 1.7, OSGi 4.1+ and Spring 4.2
It might be possible to use Gemini Blueprint on a lower <ulink
url="http://wiki.eclipse.org/index.php/Execution_Environments">execution environment</ulink>
(such <ulink url="http://java.sun.com/products/cdc/">CDC</ulink>) but
@@ -91,8 +91,7 @@
JavaBeans</ulink> (java.beans package) which, unfortunately, is missing in most
restricted environments. See this <ulink url="http://java.sun.com/products/cdc/reference/cdc_packages.pdf"
type="application/pdf">PDF</ulink> for information on CDC profiles.
- Note that, Spring 3.0 also requires Java 1.5. For Spring 2.5 and/or Java 1.4 see
- <ulink url="http://www.springframework.org/osgi">Spring Dynamic Modules</ulink> 1.x releases.
+ Note that, Spring 4.2 also requires Java 1.7.
</para>
<para>
Nevertheless, experiences and feedback on running Gemini Blueprint in restricted environments
@@ -108,8 +107,8 @@
<section id="restricted-environments">
<title>Will Gemini Blueprint work in restricted environments (such as small/mobile devices)?</title>
<para>See the <link linkend="requirements">requirements</link> entry. The OSGi Service Platform is designed to run in
- very constrained environments however, Gemini Blueprint depends on the Spring Framework v3.0 which in turn depends on
- JDK 1.5. Thus Gemini Blueprint cannot run on more constrained environments (such as the OSGi Minimum Execution Environment)
+ very constrained environments however, Gemini Blueprint depends on the Spring Framework v4.2.x which in turn depends on
+ JDK 1.7. Thus Gemini Blueprint cannot run on more constrained environments (such as the OSGi Minimum Execution Environment)
unless Spring itself also runs in those environments. There are no current plans to make such a version of Spring.
However as existing OSGi developers adopt Gemini Blueprint to simplify creation of OSGi applications and the user
base expands, the target audience can cover domains much broader than <emphasis>enterprise Java applications</emphasis>.
diff --git a/docs/src/docbkx/introduction/eclipse-migration.xml b/docs/src/docbkx/introduction/eclipse-migration.xml
index e6b39ef..f532183 100644
--- a/docs/src/docbkx/introduction/eclipse-migration.xml
+++ b/docs/src/docbkx/introduction/eclipse-migration.xml
@@ -2,15 +2,15 @@
<title>Spring Dynamic Modules becomes Eclipse Gemini Blueprint</title>
<para>
- In late 2009, as a member of the Gemini project <ulink url="http://eclipse.org/proposals/gemini/">proposal</ulink>,
- SpringSource <ulink url="http://blog.springsource.com/2009/11/24/gemini-project-proposal-at-eclipse-org/">contributed</ulink> the Spring Dynamic Modules
+ In late 2009, as a member of the Gemini project <ulink url="https://www.eclipse.org/proposals/gemini/">proposal</ulink>,
+ SpringSource <ulink url="http://spring.io/blog/2009/11/24/gemini-project-proposal-at-eclipse-org/">contributed</ulink> the Spring Dynamic Modules
(also known as Spring OSGi) <ulink url="http://www.springframework.org/osgi">project</ulink>
to the Eclipse Foundation. Spring DM v2 code base has been moved to Eclipse.org along with its issue tracker and forum. The project
became dual licensed under Apache License and EPL.
</para>
<para>
While the name has changed, the code and its functionality remain the same. Existing Spring DM applications can be easily migrated to Eclipse Gemini Blueprint
- as mentioned in the migration <ulink url="http://www.eclipse.org/gemini/blueprint/documentation/migration/">guide</ulink>.
+ as mentioned in the migration <ulink url="https://www.eclipse.org/gemini/blueprint/documentation/migration/">guide</ulink>.
</para>
<para>While the project name has changed (to Eclipse Gemini Blueprint) and significant efforts have been made to reflect this in the project documentation and resources,
there might be places that we have missed; if you find any, please <ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Gemini.Blueprint">report</ulink> them to us.
diff --git a/docs/src/docbkx/introduction/getting-started.xml b/docs/src/docbkx/introduction/getting-started.xml
index b67a60a..0035df3 100644
--- a/docs/src/docbkx/introduction/getting-started.xml
+++ b/docs/src/docbkx/introduction/getting-started.xml
@@ -19,67 +19,31 @@
<section id="get-started:first-steps:spring">
<title>Knowing Spring</title>
- <para>Gemini Blueprint uses heavily Spring framework's <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/spring-core.html">core</ulink> functionalty,
- such as the <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html">IoC</ulink> container,
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/resources.html">resource</ulink> abstraction and
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/aop.html">AOP</ulink> infrastructure. While it is not important
+ <para>Gemini Blueprint uses heavily Spring framework's <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/overview.html#overview-core-container">core</ulink> functionalty,
+ such as the <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/beans.html#beans-introduction">IoC</ulink> container,
+ <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/resources.html">resource</ulink> abstraction and
+ <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/aop.html">AOP</ulink> infrastructure. While it is not important
to know the Spring framework APIs, understanding the concepts behind them is. At a minimum, the idea behind IoC should be familiar.
That being said, the more knowledge you have about Spring framework, the faster you will pick Gemini Blueprint.
Besides the comprehensive documentation that explains the Spring Framework in detail,
there are a lot of articles, blog entries and books on the topic - take a look at the Spring framework
- <ulink url="http://www.springsource.org/documentation">home page</ulink> for more information. In general, this should be the starting point for
+ <ulink url="http://projects.spring.io/spring-framework/">home page</ulink> for more information. In general, this should be the starting point for
OSGi (or Eclipse plugin) developers wanting to try Gemini Blueprint.</para>
</section>
<section id="get-started:first-steps:osgi">
<title>Knowing OSGi</title>
- <para>Java developers, new to OSGi, can start by reading the OSGi Alliance <ulink url="http://www.osgi.org/About/HowOSGi">introduction</ulink>,
- the OSGi <ulink url="http://www.osgi.org/Specifications/HomePage">specifications</ulink> or one of the articles/blogs
- available on the internet (such as the SpringSource <ulink url="http://blog.springsource.com/category/osgi/">blogs</ulink>).
- Additionally, the Gemini Blueprint home <ulink url="http://www.springframework.org/osgi">page</ulink> hosts various links to useful materials.
+ <para>Java developers, new to OSGi, can start by reading the OSGi Alliance <ulink url="https://www.osgi.org/developer/where-to-start/">introduction</ulink>,
+ the OSGi <ulink url="https://www.osgi.org/developer/specifications/">specifications</ulink> or one of the articles/blogs
+ available on the internet.
</para>
</section>
<section id="get-started:first-steps:blueprint">
- <title>Quick start - OSGi 4.2 Blueprint Container</title>
- <para>As an alternative to the recommended Spring documentation, if OSGi 4.2 is an option, one can read the Blueprint Container specification
+ <title>Quick start - OSGi 5.x Blueprint Container</title>
+ <para>As an alternative to the recommended Spring documentation, if OSGi 5.x is an option, one can read the Blueprint Container specification
for a quick introduction to dependency injection and Gemini Blueprint functionality. Note that Blueprint is a subset of Spring and Gemini Blueprint and we recommend
the official documentation to get access to the whole set of features.
</para>
</section>
- <!--
- <section id="get-started:first-steps:samples">
- <title>Trying Out The Samples</title>
- <para>Once one is familiar with the concepts behind Spring and OSGi, she can start reading the Gemini Blueprint reference documentation (this document) and
- take the Gemini Blueprint samples for a spin. The samples are available either in the .zip distribution or from the Gemini Blueprint repository.
- The samples are a convenient way to get started quickly with Gemini Blueprint as they show various features of Gemini Blueprint and help one get pass the
- initial struggles with OSGi. However, they are not meant as the definitive guide in using OSGi rather, they aim to be a launching pad
- for "newbies" trying out OSGi in Spring.
- </para>
- <para>The current distribution contains:</para>
- <itemizedlist>
- <listitem>
- <para>Simple Service Sample</para>
- <para>A simple example that illustrates OSGi service publication and consumption through Gemini Blueprint. This is a good starting point
- for users learning the basics.</para>
- </listitem>
- <listitem>
- <para>Weather Sample</para>
- <para>A demo that shows more advanced features of Gemini Blueprint and OSGi. The application creates a very simple weather information services
- presenting some best practices in designing an application to take advantage of the modularity offered by OSGi.</para>
- </listitem>
- <listitem>
- <para>Simple Web App Sample</para>
- <para>As the name implies, this is a simple web application, containing Servlets, JSPs and JSP tags, that runs inside OSGi through Gemini Blueprint.</para>
- </listitem>
- <listitem>
- <para>Web Console Sample</para>
- <para>A more complicated sample that demos a Spring MVC annotation based, web application that runs inside OSGi through Gemini Blueprint, featuring
- class path scanning and various Spring taglib. Additionally, the web application interacts with the OSGi environment through the web UI.</para>
- </listitem>
- </itemizedlist>
- <para>Each project contains instructions regarding its content and startup procedure. Users are encouraged to experiment with the samples to get a better
- understanding of the technologies used.</para>
- </section>
- -->
</section>
<section id="get-started:help">
@@ -89,14 +53,12 @@
<section id="get-started:help:community">
<title>Community Support</title>
- <para>The Gemini Blueprint <ulink url="http://www.eclipse.org/forums/index.php/f/153/">forum</ulink>
- (and the previous Spring DM <ulink url="http://forum.springframework.org/forumdisplay.php?f=43">forum</ulink>) is a message board for all Gemini Blueprint users to
- share information and help each other. Note that registration is needed <emphasis>only</emphasis> for posting.
- </para>
+ <para>The Gemini Blueprint <ulink url="http://www.eclipse.org/forums/index.php/f/153/">forum</ulink>.</para>
+ <para>The Gemini Blueprint GitHub <ulink url="https://github.com/eclipse/gemini.blueprint">mirror</ulink>.</para>
</section>
<section id="get-started:help:professional">
<title>Professional Support</title>
- <para>Professional, from-the-source support, with guaranteed response time, is available from <ulink url="http://www.springsource.com">SpringSource</ulink>,
+ <para>Professional, from-the-source support, with guaranteed response time, is available from <ulink url="http://spring.io/">Pivotal</ulink>,
the company behind Gemini Blueprint and Spring.
</para>
</section>
@@ -106,16 +68,16 @@
<title>Following Development</title>
<para>For information on the Gemini Blueprint source code repository, nightly builds and snapshot artifacts please see the Gemini Blueprint home
- <ulink url="http://www.springsource.org/osgi">page</ulink>.
+ <ulink url="https://www.eclipse.org/gemini/blueprint/">page</ulink>.
</para>
<para>You can help make Gemini Blueprint best serve the needs of the Spring community by interacting with developers through the Spring Community
- <ulink url="http://forum.springsource.org">forums</ulink>.</para>
+ <ulink url="http://spring.io/questions">stack overflow</ulink>.</para>
<para>If you encounter a bug or want to suggest an improvement,
- please create a ticket on the Gemini Blueprint issue <ulink url="http://jira.springframework.org/">tracker</ulink>.</para>
+ please create a ticket on the Gemini Blueprint issue <ulink url="https://jira.spring.io/">tracker</ulink>.</para>
<para>To stay up to date with the latest news and announcements in the Spring eco system, subscribe to the
- Spring Community <ulink url="http://www.springframework.org/">Portal</ulink>.</para>
- <para>Lastly, you can follow the SpringSource OSGi <ulink url="http://blog.springsource.com/category/osgi/">blog</ulink> or the project team on Twitter
- (<ulink url="http://twitter.com/adriancolyer">Adrian</ulink>, <ulink url="http://twitter.com/costinl">Costin</ulink>)</para>
+ Spring Community <ulink url="http://www.spring.io/">Portal</ulink>.</para>
+ <para>Lastly, you can follow the project team on Twitter
+ (<ulink url="https://twitter.com/adriancolyer">Adrian</ulink>, <ulink url="https://twitter.com/costinl">Costin</ulink>, <ulink url="https://twitter.com/deploynix">Olaf</ulink>)</para>
</section>
</chapter>
\ No newline at end of file
diff --git a/docs/src/docbkx/introduction/requirements.xml b/docs/src/docbkx/introduction/requirements.xml
index 2415edc..fd9d84d 100644
--- a/docs/src/docbkx/introduction/requirements.xml
+++ b/docs/src/docbkx/introduction/requirements.xml
@@ -1,10 +1,10 @@
<chapter id="requirements">
<title>Requirements</title>
- <para>Gemini Blueprint 2.x binaries require JDK level 6.0 or above,
+ <para>Gemini Blueprint 2.x binaries require JDK level 7.0 or above,
and <ulink url="http://www2.osgi.org/Specifications/HomePage?section=2">OSGi
- R4.2</ulink> (though R4.1 and even R4.0 might work) or above. For JDK 1.5, consider using Gemini Blueprint 1.x.
- For JDK 1.4, consider using Spring Dynamic Modules 1.x.
+ R5.x</ulink> (though R4.1 and even R4.0 might work) or above. For JDK < 1.7, consider using Gemini Blueprint 1.x.
+ For JDK < 1.5, consider using Spring Dynamic Modules 1.x.
</para>
<para>
Bundles deployed for use with Gemini Blueprint should specify
diff --git a/docs/src/docbkx/introduction/what-is-new.xml b/docs/src/docbkx/introduction/what-is-new.xml
index 60ecb2b..b721fdd 100644
--- a/docs/src/docbkx/introduction/what-is-new.xml
+++ b/docs/src/docbkx/introduction/what-is-new.xml
@@ -7,10 +7,30 @@
<para>While a relatively young project, each version of Gemini Blueprint (even minor ones) offers new functionality. This chapter is a guide to the new
and improved feature and intended as a high-level, short summary. Please follow the appropriate links for more in-depth information.</para>
- <note>This section includes the updates from Spring Dynamic Modules (Spring DM) project:</note>
+ <note>This section includes the updates from Spring Dynamic Modules (Spring DM) project and previous gemini blueprint versions.</note>
+
+ <section id="dm-2.0.0">
+ <title>Gemini Blueprint 2.0.0+</title>
+
+ <section id="dm-2.0.0.x:blueprint">
+ <title>OSGi 5.x Blueprint Reference Implementation (RI)</title>
+ <para>Gemini Blueprint served as the basis for the Blueprint Container specification, introduced by OSGi 5 Gemini Blueprint stands as the RI for the
+ aforementioned specification, providing the Blueprint API and implementation out of the box. Various aspect of Gemini Blueprint have been adjusted for
+ consistency to the Blueprint specification. For more information on the two models, see <xref linkend="blueprint"/> for more information.</para>
+ </section>
+ <section id="dm-2.0.0.x:jdk5">
+ <title>Java 7</title>
+ <para>Gemini Blueprint requires <ulink url="https://java.sun.com/j2se/1.7.0/">JDK 7</ulink> to run (or compile). The framework code has been
+ revised to take advantage of the JDK 7 features.</para>
+ </section>
+ <section id="dm-2.0.x:spring-3.x">
+ <title>Spring 4.2.x</title>
+ <para>Besides the Java 7 upgrade, Gemini Blueprint requires Spring 4.2.x to get access to the latest framework features and JDK optimizations.</para>
+ </section>
+ </section>
<section id="dm-2.0.x">
- <title>Gemini Blueprint</title>
+ <title>Gemini Blueprint 1.x</title>
<section id="dm-2.0.x:blueprint">
<title>OSGi 4.2 Blueprint Reference Implementation (RI)</title>
@@ -72,45 +92,4 @@
We apologize for any inconvenience created to users relying on these naming conventions.</para>
</section>
</section>
- <!--
- <section id="dm-1.1.x">
- <title>1.1.x</title>
-
- <section id="dm-1.1.x:web">
- <title>Web Support</title>
- <para>The biggest feature in Spring DM 1.1.x is the transparent support for web applications on OSGi platforms. By integrating
- directly with web containers (such as Apache Tomcat and Jetty), Gemini Blueprint allows WARs using Servlet, JSP and taglib technologies to
- be used with little or no effort at all.
- Please see <xref linkend="web"/> for details.
- </para>
- <section id="dm-1.1.x:web:spring-mvc">
- <title>Spring-MVC Integration</title>
- <para>Additionally, with 1.1.x it is possible to run Spring-MVC applications inside OSGi environments. See <xref linkend="web:spring-mvc"/>
- for more information.</para>
- </section>
- </section>
- <section id="dm-1.1.x:io">
- <title>Classpath Resource Abstraction</title>
- <para>1.1.x adds support for <literal>classpath:</literal> and <literal>classpath*:</literal> prefixes to the OSGi <interfacename>Resource</interfacename>
- abstraction. This allows the discovery of classpath resources (such as Spring's
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/new-in-2.html#new-in-2-ioc-component-scanning">component scanning</ulink>) to
- work out-of-the-box across multiple bundles on the supported OSGi platforms. See <xref linkend="bnd-app-ctx:osgi-resource"/> for more information.
- </para>
- </section>
- <section id="dm-1.1.x:configuration">
- <title>Pluggable Extender Configuration</title>
- <para>1.1.x makes it easy to change the default configuration for the various <link linkend="extender-pattern">extender</link>s used by Spring DM. By using
- <link linkend="appendix-tips:fragments">fragments</link>, users can customize the way application contexts are started, the web container used
- for web deployment or the thread-pool for running Spring applications. Additionally, it is possible to receive events
- regarding the OSGi Spring application contexts lifecycle. <xref linkend="bnd-app-ctx:extender"/> lists the available options and explains them in detail.
- </para>
- </section>
- <section id="dm-1.1.x:improved-class-loading">
- <title>Improved Class Loading</title>
- <para>In 1.1.x, the proxy creation has been improved, leading to better package wiring for the managed bundles. See the FAQ for more information.
- </para>
- </section>
- </section>
- -->
-
-</chapter>
\ No newline at end of file
+ </chapter>
\ No newline at end of file
diff --git a/docs/src/docbkx/reference/compendium/compendium.xml b/docs/src/docbkx/reference/compendium/compendium.xml
index 5442391..fe5edbd 100644
--- a/docs/src/docbkx/reference/compendium/compendium.xml
+++ b/docs/src/docbkx/reference/compendium/compendium.xml
@@ -22,23 +22,33 @@
<area id="compendium:ns:xml:uri.loc" coords="9 95"/>
</areaspec>
<programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:task="http://www.springframework.org/schema/task"
+ xmlns:compendium="http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium"
+
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.2.xsd
+ http://www.springframework.org/schema/task
+ http://www.springframework.org/schema/task/spring-task-3.2.xsd
+ http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.2.xsd
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium.xsd">
<!-- use the OSGi namespace elements directly -->
<service id="simpleServiceOsgi" ref="simpleService"
interface="org.xyz.MyService" />
<!-- qualify compendium namespace elements -->
- <osgix:cm-properties id="cm" persistent-id="com.xyz.myapp"/>
+ <compendium:cm-properties id="cm" persistent-id="com.xyz.myapp"/>
</beans:beans>]]></programlisting>
<calloutlist>
@@ -82,26 +92,37 @@
<interfacename>ManagedServiceFactory</interfacename>.</para></note>
<para>Those familiar with Spring's
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/xsd-config.html#xsd-config-body-schemas-util">util namespace</ulink> will
+ <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/xsd-configuration.html#xsd-config-body-schemas-util">util schema</ulink> will
find <literal><![CDATA[<osgi:cm-properties/>]]></literal> element similar to <literal><![CDATA[<util:properties/>]]></literal>.</para>
<para>It is possible to specify a default set of property values to be used in the event that the configuration dictionary does not contain
an entry for a given key. The declaration is similar to the <literal>props</literal> element inside the Spring beans namespace:</para>
<programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi-compendium"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:task="http://www.springframework.org/schema/task"
+ xmlns:compendium="http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium"
- <osgix:cm-properties id="cfg.with.defaults" persistent-id="data.source.office.2">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.2.xsd
+ http://www.springframework.org/schema/task
+ http://www.springframework.org/schema/task/spring-task-3.2.xsd
+ http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.2.xsd
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium.xsd">
+
+ <compendium:cm-properties id="cfg.with.defaults" persistent-id="data.source.office.2">
<beans:prop key="host">localhost</beans:prop>
<beans:prop key="port">3306</beans:prop>
- </osgix:cm-properties>
+ </compendium:cm-properties>
</beans:beans>]]></programlisting>
@@ -111,30 +132,35 @@
(default <literal>false</literal>) allows one to revert the merging algorithm, forcing the local properties to override the entries in the CM.</para>
<para>Since <literal>cm-properties</literal> exposes the CM entries as <classname>Properties</classname>, it can be used with Spring's <classname>
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html#beans-factory-placeholderconfigurer">PropertyPlaceholderConfigurer</ulink></classname>
- and <classname><ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html#beans-factory-overrideconfigurer">PropertyOverrideConfigurer</ulink></classname>
+ <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/beans.html#beans-factory-placeholderconfigurer">PropertyPlaceholderConfigurer</ulink></classname>
+ and <classname><ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/beans.html#beans-factory-overrideconfigurer">PropertyOverrideConfigurer</ulink></classname>
to externalize and customize environment-specific properties:</para>
<programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xmlns:ctx="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:compendium="http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+ http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-4.2.xsd
+ http://www.springframework.org/schema/mvc
+ http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium
+ http://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium.xsd">
<!-- Configuration Admin entry -->
- <osgix:cm-properties id="cmProps" persistent-id="com.xyz.myapp">
+ <compendium:cm-properties id="cmProps" persistent-id="com.xyz.myapp">
<prop key="host">localhost</prop>
- </osgix:cm-properties>
+ </compendium:cm-properties>
<!-- placeholder configurer -->
- <ctx:property-placeholder properties-ref="cmProps" />
+ <context:property-placeholder properties-ref="cmProps" />
<bean id="dataSource" ...>
<property name="host" value="${host}"/>
@@ -192,18 +218,18 @@
<title>Configuration Admin Runtime Updates</title>
<para>A powerful feature of Configuration Admin is the ability to update (or delete) entries at runtime. That is, the configuration data
stored in Configuration Admin may be updated after the bean has been created. By default, any post-creation updates will be ignored. However,
- one can configure <literal>managed-properties</literal> element to receive configuration updates through the <literal>update-strategy</literal>
- attribute, which can have a value of either <literal>bean-managed</literal> or <literal>container-managed</literal>.</para>
+ one can configure <literal>managed-properties</literal> element to receive configuration updates through the <literal>autowire-on-update</literal>
+ and <literal>update-method</literal> attributes.</para>
- <para><literal>bean-managed</literal> strategy will pass all the updates made to the configuration to a callback present on the bean, specified
- through the <literal>update-method</literal> attribute (which becomes required). The update method must have one of the following signatures:</para>
+ <para><literal>update-method</literal> specifies the bean method to invoke whenever an update occurs in the configuration data.
+ The update method must have one of the following signatures:</para>
<programlisting language="java"><![CDATA[public void anyMethodName(Map properties)
public void anyMethodName(Map<String,?> properties); // for Java 5]]></programlisting>
- <para>In contrast, the <literal>container-managed</literal> update strategy will re-inject bean properties by name based on the new properties
- received in the update. For <literal>container-managed</literal> updates, the component class must provide setter methods for the component properties
- that it wishes to have updated. Consider the following class definitions:</para>
+ <para>If <literal>autowire-on-update</literal> is set to <literal>true</literal> (default is <literal>false</literal>) then the container will autowire the target bean everytime an update occurs.
+ If both <literal>autowire-on-update</literal> and <literal>update-method</literal> are specified then the autowiring process will take precedence.
+ For autowiring, the component class must provide setter methods for the component properties that it wishes to have updated. Consider the following class definitions:</para>
<programlisting language="java"><![CDATA[public class ContainerManagedBean {
// will be reinjected (since it has a setter)
@@ -228,12 +254,12 @@
<para>and configuraton:</para>
<programlisting language="xml"><![CDATA[<bean id="containerManaged" class="ContainerManagedBean">
- <osgix:managed-properties persistent-id="labX" update-strategy="container-managed"/>
+ <osgix:managed-properties persistent-id="labX" autowire-on-update="true"/>
<property name="integer" value="23"/>
</bean>
<bean id="beanManaged" class="SelfManagedBean">
- <osgix:managed-properties persistent-id="labY" update-strategy="bean-managed" update-method="updateCallback"/>
+ <osgix:managed-properties persistent-id="labY" update-method="updateCallback"/>
</bean>]]></programlisting>
<para>Any updates made to the CM entry <literal>labX</literal> will be automatically reinjected on existing instances of
@@ -249,22 +275,22 @@
<colspec colname="c3" colwidth="4*"/>
<thead>
<row>
- <entry><literal>update-strategy</literal></entry>
+ <entry><literal>autowire-on-update</literal></entry>
<entry><literal>update-method</literal></entry>
<entry>Behaviour</entry>
</row>
</thead>
<tbody>
<row>
- <entry><literal>container-managed</literal></entry>
- <entry><emphasis>ignored</emphasis></entry>
+ <entry><literal>true</literal></entry>
+ <entry><emphasis>optional</emphasis>, called after autowiring</entry>
<entry>Reinjects the bean properties, using the properties present in the update. The re-injection will be applied while locking (through
a <literal>synchronized</literal> instruction) the bean instance. If the locking or re-injection strategy is not suitable, consider using
- the <literal>bean-managed</literal> approach.</entry>
+ the <literal>update-method</literal> only approach.</entry>
</row>
<row>
- <entry><literal>bean-managed</literal></entry>
- <entry><emphasis>required</emphasis></entry>
+ <entry><literal>false</literal> (default)</entry>
+ <entry><emphasis>optional</emphasis></entry>
<entry>Invokes the <literal>update-method</literal> callback on the bean instance, passing the updated configuration (as a
<interfacename>Map</interfacename> object that can be safely cast to a <classname>Dictionary</classname> if needed). No locking is
performed.</entry>
@@ -378,11 +404,21 @@
<literal>all-classes</literal> advertises all Java interfaces and classes.</entry>
</row>
<row>
- <entry>update-strategy</entry>
- <entry>none <literal>(default)</literal></entry>
- <entry>bean-managed</entry>
- <entry namest="c4" nameend="c5">container-managed</entry>
- <entry>Defines the update strategy for configuration modifications made after the associated beans have been created.</entry>
+ <entry>autowire-on-update</entry>
+ <entry namest="c2" nameend="c3">false <literal>(default)</literal></entry>
+ <entry namest="c4" nameend="c5">true</entry>
+ <entry>Whether or not the container should autowire the target bean everytime an update occurs.
+ When <literal>true</literal> is specified, the container will perform autowire (by name) the bean instance with the
+ newly set properties. In case <literal>update-method</literal> attribute is used as well, the autowiring process will
+ take precedence.</entry>
+ </row>
+ <row>
+ <entry>update-method</entry>
+ <entry namest="c2" nameend="c3">none <literal>(default)</literal></entry>
+ <entry namest="c4" nameend="c5">someMethod</entry>
+ <entry>The update method to invoke whenever an update occurs in the configuration data. Allows the target
+ bean to process the update information itself. In case <literal>autowire-on-update</literal> is also used, the <literal>update-method</literal>
+ will be invoked after the autowiring takes place.</entry>
</row>
</tbody>
</tgroup>
@@ -415,7 +451,7 @@
<osgix:managed-service-factory id="data-msf"
factory-pid="org.xyz.labX"
- update-strategy="bean-managed"
+ autowire-on-update="true"
update-method="refresh">
<osgix:interfaces>
<value>java.util.Collection</value>
@@ -437,10 +473,10 @@
<para><interfacename>ManagedServiceFactory</interfacename> factory persistent id</para>
</callout>
<callout arearefs="compendium:msf:def.2:us">
- <para>how should Gemini Blueprint behave when a <interfacename>Configuration</interfacename> is updated</para>
+ <para>whether Gemini Blueprint should autowire the bean when a <interfacename>Configuration</interfacename> is updated</para>
</callout>
<callout arearefs="compendium:msf:def.2:um">
- <para>the method to invoke when for <literal>bean-managed</literal> updates</para>
+ <para>the method to invoke after autowiring</para>
</callout>
<callout arearefs="compendium:msf:def.2:intfs">
<para>the interfaces under which the nested beans are published as OSGi services</para>
@@ -466,8 +502,9 @@
Configuration Admin will be injected by name, possibly overriding existing settings. Once created and configured, each nested, anonymous bean instance
is registered as an OSGi service under the <interfacename>java.util.Collection</interfacename> and <interfacename>java.util.Queue</interfacename>
interfaces. The OSGi service lifecycle is monitored by a registration listener, namely the bean <literal>queueTracker</literal>.
- Finally, due to the specified <literal>update-strategy</literal>, any updates executed to each CM configuration will cause the
- <methodname>refresh</methodname> callback to be invoked on the associated bean instance.</para>
+ Finally, due to the specified <literal>autowire-on-update</literal> and <literal>update-method</literal> attributes, any updates executed to each CM configuration
+ will cause the container to autowire the associated bean instance with the newly set properties and after that a
+ <methodname>refresh</methodname> callback will be invoked on it.</para>
</section>
<section id="compendium:cm:dict">
@@ -489,4 +526,4 @@
</section>
</chapter>
-
\ No newline at end of file
+
diff --git a/docs/src/docbkx/reference/deployment.xml b/docs/src/docbkx/reference/deployment.xml
index 371d89c..68fc022 100644
--- a/docs/src/docbkx/reference/deployment.xml
+++ b/docs/src/docbkx/reference/deployment.xml
@@ -389,14 +389,14 @@
<entry><interfacename>ApplicationEventMulticaster</interfacename>
<footnote>Part of <literal>org.springframework.context.event</literal> package</footnote>
</entry>
- <entry><literal><ulink url="http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/context/event/ApplicationEventMulticaster.html">
+ <entry><literal><ulink url="https://docs.spring.io/spring/docs/4.2.x/javadoc-api/org/springframework/context/event/ApplicationEventMulticaster.html">
ApplicationEventMultiCaster</ulink></literal> used for propagating Gemini Blueprint/Spring DM <link linkend="app-deploy:extender-configuration:events">events</link>
to third parties.
</entry>
- <entry>An instance of <classname><ulink url="http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/context/event/SimpleApplicationEventMulticaster.html">
+ <entry>An instance of <classname><ulink url="https://docs.spring.io/spring/docs/4.2.x/javadoc-api/org/springframework/context/event/SimpleApplicationEventMulticaster.html">
SimpleApplicationEventMulticaster</ulink></classname> is used.
See <classname>AbstractApplicationContext</classname>
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/context/support/AbstractApplicationContext.html">javadoc</ulink>
+ <ulink url="https://docs.spring.io/spring/docs/4.2.x/javadoc-api/org/springframework/context/support/AbstractApplicationContext.html">javadoc</ulink>
for more information regarding available beans in an application context.</entry>
</row>
@@ -543,7 +543,7 @@
Of course, it is also possible for the client to unregister the listener manually during a bundle lifecycle.
<note>The Gemini Blueprint/Spring DM events semantics are slightly different then
- <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html#context-functionality-events">Spring's</ulink>. The OSGi events are
+ <ulink url="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/beans.html#context-functionality-events">Spring's</ulink>. The OSGi events are
not sent to beans inside the <emphasis>causing</emphasis> application context but to other parties (possible beans in other application contexts)
interested in monitoring its behaviour.</note>
</para>
@@ -577,85 +577,17 @@
</itemizedlist>
<para>In addition, the Spring Framework provides a number of bundles that
- are required to be installed as dependencies. As of release 2.5 of the
- Spring Framework, the Spring jars included in the Spring distribution are valid OSGi
- bundles and can be installed directly into an OSGi platform. The minimum
- required set of bundles is:</para>
-
- <itemizedlist>
- <listitem>
- <para>org.springframework.aop.jar (bundle symbolic name
- <literal>org.springframework.aop</literal>)</para>
- </listitem>
-
- <listitem>
- <para>org.springframework.asm.jar (bundle symbolic name
- <literal>org.springframework.asm</literal>)</para>
- </listitem>
-
- <listitem>
- <para>org.springframework.beans.jar (bundle symbolic name
- <literal>org.springframework.beans</literal>)</para>
- </listitem>
-
- <listitem>
- <para>org.springframework.core.jar (bundle symbolic name
- <literal>org.springframework.core</literal>)</para>
- </listitem>
-
- <listitem>
- <para>org.springframework.context.jar (bundle symbolic name
- <literal>org.springframework.context</literal>)</para>
- </listitem>
-
- <listitem>
- <para>org.springframework.expression.jar (bundle symbolic name
- <literal>org.springframework.expression</literal>)</para>
- </listitem>
-
- </itemizedlist>
-
- <para>In additional the following supporting library bundles are
- required. OSGi-ready versions of these libraries are shipped with the
- Gemini Blueprint distribution.</para>
-
- <itemizedlist>
- <listitem>
- <para>aopalliance</para>
- </listitem>
-
- <listitem>
- <para>cglib-nodep (when proxying classes rather then
- interfaces, needed in most cases)</para>
- </listitem>
- <listitem>
- <para>commons-logging API (<ulink url="http://www.slf4j.org/">SLF4J</ulink> version <emphasis>highly</emphasis> recommended:</para>
- <itemizedlist>
- <listitem>
- <para>SLF4J API (com.springsource.sfl4j.api.jar)</para>
- </listitem>
- <listitem>
- <para>SLF4J Implementation Bridge (such as Log4j - com.springsource.sfl4j.log4j.jar)</para>
- </listitem>
- <listitem>
- <para>SLF4J commons logging adapter (com.springsource.sfl4j.org.apache.commons.logging.jar)</para>
- </listitem>
-
- </itemizedlist>
- </listitem>
-
- <listitem>
- <para>logging implementation suitable for commons-logging (such as log4j)</para>
- </listitem>
-
- </itemizedlist>
+ are required to be installed as dependencies. As of release 4.2.4 of the
+ Spring Framework, OSGi bundle versions are maintained by the Apache ServiceMix team and published using their group id, see for example
+ <ulink url="http://search.maven.org/#search|ga|1|g%3Aorg.apache.servicemix.bundles%20spring-">all Spring OSGi artifacts published in maven central</ulink>.
+ </para>
</section>
<section id="app-deploy:spring-namespaces">
<title>Spring XML Authoring Support</title>
- <para>Spring 2.0 introduced (among other things) <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/xsd-config.html">
- easier</ulink> XML configuration and <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/extensible-xml.html">
+ <para>Spring 2.0 introduced (among other things) <ulink url="https://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/oxm.html#oxm-schema-based-config">
+ easier</ulink> XML configuration and <ulink url="https://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/xml-custom.html">
extensible</ulink> XML authoring. The latter gives the ability of creating custom schemas that are discovered automatically (in non-OSGi environment)
by the Spring XML infrastructure by including them in the classpath. Gemini Blueprint/Spring DM is aware of this process and supports it in OSGi environments so
that custom schemas are available to bundles that use them without any extra code or manifest declaration.</para>
@@ -687,7 +619,7 @@
the bundle might not be able to load certain classes or resources, load incorrect versions or even load multiple versions at the same time which usually
result in <literal>ClassCastException</literal>, <literal>NoClassDefFoundError</literal> or <literal>LinkageError</literal>. We strongly
recommend that you get familiar with the basics and, at least for starters, use tools
- (such as <ulink url="http://www.springsource.org/bundlor">Bundlor</ulink> or <ulink url="http://www.aqute.biz/Code/Bnd">BND</ulink>) for creating proper
+ (such as <ulink url="https://docs.spring.io/s2-bundlor/1.0.x/user-guide/html/">Bundlor</ulink> or <ulink url="http://www.aqute.biz/Bnd/Bnd">BND</ulink>) for creating proper
OSGi manifests.</important>
</section>
@@ -773,7 +705,7 @@
classpath.</para>
<para>Managed, OSGi-aware runtime environments such as
- <ulink url="http://www.springsource.com/products/dmserver">dmServer</ulink>
+ <ulink url="http://docs.spring.io/s2-dmserver/2.0.x/user-guide/html/">dmServer</ulink>
provide additional logging and insight not just for the bundle at hand, but also
regarding the application context and the VM among other things.</para>
diff --git a/docs/src/docbkx/resources/images/admons/blank.png b/docs/src/docbkx/resources/images/admons/blank.png
new file mode 100644
index 0000000..764bf4f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/blank.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/caution.gif b/docs/src/docbkx/resources/images/admons/caution.gif
new file mode 100644
index 0000000..d9f5e5b
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/caution.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/caution.png b/docs/src/docbkx/resources/images/admons/caution.png
new file mode 100644
index 0000000..5b7809c
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/caution.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/caution.tif b/docs/src/docbkx/resources/images/admons/caution.tif
new file mode 100644
index 0000000..4a28294
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/caution.tif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/draft.png b/docs/src/docbkx/resources/images/admons/draft.png
new file mode 100644
index 0000000..0084708
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/draft.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/home.gif b/docs/src/docbkx/resources/images/admons/home.gif
new file mode 100644
index 0000000..6784f5b
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/home.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/home.png b/docs/src/docbkx/resources/images/admons/home.png
new file mode 100644
index 0000000..cbb711d
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/home.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/important.gif b/docs/src/docbkx/resources/images/admons/important.gif
new file mode 100644
index 0000000..6795d9a
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/important.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/important.png b/docs/src/docbkx/resources/images/admons/important.png
new file mode 100644
index 0000000..ad57f6f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/important.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/important.tif b/docs/src/docbkx/resources/images/admons/important.tif
new file mode 100644
index 0000000..184de63
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/important.tif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/next.gif b/docs/src/docbkx/resources/images/admons/next.gif
new file mode 100644
index 0000000..aa1516e
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/next.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/next.png b/docs/src/docbkx/resources/images/admons/next.png
new file mode 100644
index 0000000..45835bf
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/next.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/note.gif b/docs/src/docbkx/resources/images/admons/note.gif
new file mode 100644
index 0000000..f329d35
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/note.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/note.png b/docs/src/docbkx/resources/images/admons/note.png
new file mode 100644
index 0000000..ad57f6f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/note.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/note.tif b/docs/src/docbkx/resources/images/admons/note.tif
new file mode 100644
index 0000000..08644d6
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/note.tif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/prev.gif b/docs/src/docbkx/resources/images/admons/prev.gif
new file mode 100644
index 0000000..64ca8f3
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/prev.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/prev.png b/docs/src/docbkx/resources/images/admons/prev.png
new file mode 100644
index 0000000..cf24654
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/prev.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/tip.gif b/docs/src/docbkx/resources/images/admons/tip.gif
new file mode 100644
index 0000000..823f2b4
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/tip.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/tip.png b/docs/src/docbkx/resources/images/admons/tip.png
new file mode 100644
index 0000000..ad57f6f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/tip.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/tip.tif b/docs/src/docbkx/resources/images/admons/tip.tif
new file mode 100644
index 0000000..4a3d8c7
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/tip.tif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/toc-blank.png b/docs/src/docbkx/resources/images/admons/toc-blank.png
new file mode 100644
index 0000000..6ffad17
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/toc-blank.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/toc-minus.png b/docs/src/docbkx/resources/images/admons/toc-minus.png
new file mode 100644
index 0000000..abbb020
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/toc-minus.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/toc-plus.png b/docs/src/docbkx/resources/images/admons/toc-plus.png
new file mode 100644
index 0000000..941312c
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/toc-plus.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/up.gif b/docs/src/docbkx/resources/images/admons/up.gif
new file mode 100644
index 0000000..aabc2d0
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/up.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/up.png b/docs/src/docbkx/resources/images/admons/up.png
new file mode 100644
index 0000000..07634de
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/up.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/warning.gif b/docs/src/docbkx/resources/images/admons/warning.gif
new file mode 100644
index 0000000..c6acdec
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/warning.gif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/warning.png b/docs/src/docbkx/resources/images/admons/warning.png
new file mode 100644
index 0000000..ef3e10f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/warning.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/admons/warning.tif b/docs/src/docbkx/resources/images/admons/warning.tif
new file mode 100644
index 0000000..7b6611e
--- /dev/null
+++ b/docs/src/docbkx/resources/images/admons/warning.tif
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/1.png b/docs/src/docbkx/resources/images/callouts/1.png
new file mode 100644
index 0000000..7d47343
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/1.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/10.png b/docs/src/docbkx/resources/images/callouts/10.png
new file mode 100644
index 0000000..997bbc8
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/10.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/11.png b/docs/src/docbkx/resources/images/callouts/11.png
new file mode 100644
index 0000000..ce47dac
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/11.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/12.png b/docs/src/docbkx/resources/images/callouts/12.png
new file mode 100644
index 0000000..31daf4e
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/12.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/13.png b/docs/src/docbkx/resources/images/callouts/13.png
new file mode 100644
index 0000000..14021a8
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/13.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/14.png b/docs/src/docbkx/resources/images/callouts/14.png
new file mode 100644
index 0000000..64014b7
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/14.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/15.png b/docs/src/docbkx/resources/images/callouts/15.png
new file mode 100644
index 0000000..0d65765
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/15.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/2.png b/docs/src/docbkx/resources/images/callouts/2.png
new file mode 100644
index 0000000..5d09341
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/2.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/3.png b/docs/src/docbkx/resources/images/callouts/3.png
new file mode 100644
index 0000000..ef7b700
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/3.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/4.png b/docs/src/docbkx/resources/images/callouts/4.png
new file mode 100644
index 0000000..adb8364
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/4.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/5.png b/docs/src/docbkx/resources/images/callouts/5.png
new file mode 100644
index 0000000..4d7eb46
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/5.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/6.png b/docs/src/docbkx/resources/images/callouts/6.png
new file mode 100644
index 0000000..0ba694a
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/6.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/7.png b/docs/src/docbkx/resources/images/callouts/7.png
new file mode 100644
index 0000000..472e96f
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/7.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/8.png b/docs/src/docbkx/resources/images/callouts/8.png
new file mode 100644
index 0000000..5e60973
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/8.png
Binary files differ
diff --git a/docs/src/docbkx/resources/images/callouts/9.png b/docs/src/docbkx/resources/images/callouts/9.png
new file mode 100644
index 0000000..a0676d2
--- /dev/null
+++ b/docs/src/docbkx/resources/images/callouts/9.png
Binary files differ
diff --git a/extender/pom.xml b/extender/pom.xml
index c232950..2971e9c 100644
--- a/extender/pom.xml
+++ b/extender/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/config.bundle/pom.xml b/integration-tests/bundles/blueprint/config.bundle/pom.xml
index 691ce19..c072f2b 100644
--- a/integration-tests/bundles/blueprint/config.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/config.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/error.bundle/pom.xml b/integration-tests/bundles/blueprint/error.bundle/pom.xml
index 854f83f..611217d 100644
--- a/integration-tests/bundles/blueprint/error.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/error.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/pom.xml b/integration-tests/bundles/blueprint/pom.xml
index 351d940..fbd52fb 100644
--- a/integration-tests/bundles/blueprint/pom.xml
+++ b/integration-tests/bundles/blueprint/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/simple.bundle/pom.xml b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
index b18f44c..fb474c7 100644
--- a/integration-tests/bundles/blueprint/simple.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
index 3e626d8..241fbda 100644
--- a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
index 7053e0a..2e82465 100644
--- a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
+++ b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
index c71cd43..7a21297 100644
--- a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
index a61f78b..b24cc95 100644
--- a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
index 2efef54..3c80877 100644
--- a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/pom.xml b/integration-tests/bundles/config.bundle/pom.xml
index ab867a6..c428966 100644
--- a/integration-tests/bundles/config.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
index e9e6cdb..0b92225 100644
--- a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
index 90ed9d3..f0a9c20 100644
--- a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
index 115f1f4..aa022af 100644
--- a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
index f0e94da..ca951ab 100644
--- a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
+++ b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/configuration.test.bundle/pom.xml b/integration-tests/bundles/configuration.test.bundle/pom.xml
index 9b9598c..f000dd8 100644
--- a/integration-tests/bundles/configuration.test.bundle/pom.xml
+++ b/integration-tests/bundles/configuration.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/deadlock.bundle/pom.xml b/integration-tests/bundles/deadlock.bundle/pom.xml
index a2fcb1d..6b56b5a 100644
--- a/integration-tests/bundles/deadlock.bundle/pom.xml
+++ b/integration-tests/bundles/deadlock.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/dependency.factory.bundle/pom.xml b/integration-tests/bundles/dependency.factory.bundle/pom.xml
index 7b2f75a..bbca23c 100644
--- a/integration-tests/bundles/dependency.factory.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.factory.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/dependency.test.bundle/pom.xml b/integration-tests/bundles/dependency.test.bundle/pom.xml
index 112ad96..7146e64 100644
--- a/integration-tests/bundles/dependency.test.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/embedded.ns.bundle/pom.xml b/integration-tests/bundles/embedded.ns.bundle/pom.xml
index 4d97149..7767812 100644
--- a/integration-tests/bundles/embedded.ns.bundle/pom.xml
+++ b/integration-tests/bundles/embedded.ns.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/error.bundle/pom.xml b/integration-tests/bundles/error.bundle/pom.xml
index 5b35685..4e7a36f 100644
--- a/integration-tests/bundles/error.bundle/pom.xml
+++ b/integration-tests/bundles/error.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/export.import.dependency.bundle/pom.xml b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
index 4fe5940..e8f6319 100644
--- a/integration-tests/bundles/export.import.dependency.bundle/pom.xml
+++ b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/extender.fragment.bundle/pom.xml b/integration-tests/bundles/extender.fragment.bundle/pom.xml
index d032aef..f8d013a 100644
--- a/integration-tests/bundles/extender.fragment.bundle/pom.xml
+++ b/integration-tests/bundles/extender.fragment.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/extender.listener.bundle/pom.xml b/integration-tests/bundles/extender.listener.bundle/pom.xml
index 1ffd33c..03c77ae 100644
--- a/integration-tests/bundles/extender.listener.bundle/pom.xml
+++ b/integration-tests/bundles/extender.listener.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/extender.version.bundle/pom.xml b/integration-tests/bundles/extender.version.bundle/pom.xml
index a489b06..072a8eb 100644
--- a/integration-tests/bundles/extender.version.bundle/pom.xml
+++ b/integration-tests/bundles/extender.version.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/io.fragment.1.bundle/pom.xml b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
index 445c740..f1471e6 100644
--- a/integration-tests/bundles/io.fragment.1.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/io.fragment.2.bundle/pom.xml b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
index 3fdbf04..5b14bbe 100644
--- a/integration-tests/bundles/io.fragment.2.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/jdk.proxy.bundle/pom.xml b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
index 5799e84..d29bb2f 100644
--- a/integration-tests/bundles/jdk.proxy.bundle/pom.xml
+++ b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
index b8b7869..7b13897 100644
--- a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
+++ b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/jdk5/pom.xml b/integration-tests/bundles/jdk5/pom.xml
index 171fb38..67d495a 100644
--- a/integration-tests/bundles/jdk5/pom.xml
+++ b/integration-tests/bundles/jdk5/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/lifecycle.test.bundle/pom.xml b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
index c4ff03a..9baae76 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/pom.xml
+++ b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
index 0f5a51e..7ccf1d0 100644
--- a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
+++ b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index e0e880d..5cfe387 100644
--- a/integration-tests/bundles/pom.xml
+++ b/integration-tests/bundles/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-tests-parent</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/proxy.creator.bundle/pom.xml b/integration-tests/bundles/proxy.creator.bundle/pom.xml
index 2102c80..00ca2b0 100644
--- a/integration-tests/bundles/proxy.creator.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.creator.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
index dd58f0d..57c084f 100644
--- a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/proxy.listener/pom.xml b/integration-tests/bundles/proxy.listener/pom.xml
index 0a6235b..a596dcd 100644
--- a/integration-tests/bundles/proxy.listener/pom.xml
+++ b/integration-tests/bundles/proxy.listener/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/recursive.type.bundle/pom.xml b/integration-tests/bundles/recursive.type.bundle/pom.xml
index a56bc36..9c592b7 100644
--- a/integration-tests/bundles/recursive.type.bundle/pom.xml
+++ b/integration-tests/bundles/recursive.type.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/reference.test.bundle/pom.xml b/integration-tests/bundles/reference.test.bundle/pom.xml
index 8743f4d..1e4add5 100644
--- a/integration-tests/bundles/reference.test.bundle/pom.xml
+++ b/integration-tests/bundles/reference.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/scoped.a.bundle/pom.xml b/integration-tests/bundles/scoped.a.bundle/pom.xml
index eb0d79f..0098686 100644
--- a/integration-tests/bundles/scoped.a.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.a.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/scoped.b.bundle/pom.xml b/integration-tests/bundles/scoped.b.bundle/pom.xml
index ae03bc5..139e351 100644
--- a/integration-tests/bundles/scoped.b.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.b.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/scoped.common.bundle/pom.xml b/integration-tests/bundles/scoped.common.bundle/pom.xml
index 0a255eb..e6dd95b 100644
--- a/integration-tests/bundles/scoped.common.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.common.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/service.listener.bundle/pom.xml b/integration-tests/bundles/service.listener.bundle/pom.xml
index 926c232..46fe936 100644
--- a/integration-tests/bundles/service.listener.bundle/pom.xml
+++ b/integration-tests/bundles/service.listener.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/simple.service.2.bundle/pom.xml b/integration-tests/bundles/simple.service.2.bundle/pom.xml
index 0ce1781..72e8127 100644
--- a/integration-tests/bundles/simple.service.2.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.2.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/simple.service.3.bundle/pom.xml b/integration-tests/bundles/simple.service.3.bundle/pom.xml
index dbae8a4..cb9592f 100644
--- a/integration-tests/bundles/simple.service.3.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.3.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
index 465622c..ac37a0b 100644
--- a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/simple.service.bundle.identical/pom.xml b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
index ffa8216..52bb685 100644
--- a/integration-tests/bundles/simple.service.bundle.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/simple.service.bundle/pom.xml b/integration-tests/bundles/simple.service.bundle/pom.xml
index 7667d66..b080630 100644
--- a/integration-tests/bundles/simple.service.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/tccl.bundle/pom.xml b/integration-tests/bundles/tccl.bundle/pom.xml
index 7208edb..7586714 100644
--- a/integration-tests/bundles/tccl.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/tccl.intf.bundle/pom.xml b/integration-tests/bundles/tccl.intf.bundle/pom.xml
index 0511b4d..3edef70 100644
--- a/integration-tests/bundles/tccl.intf.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.intf.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/trivial.bundle/pom.xml b/integration-tests/bundles/trivial.bundle/pom.xml
index bfca4ab..f85b0da 100644
--- a/integration-tests/bundles/trivial.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/trivial.test.bundle/pom.xml b/integration-tests/bundles/trivial.test.bundle/pom.xml
index eec2385..14c3022 100644
--- a/integration-tests/bundles/trivial.test.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 40c7660..a96ee3b 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index 57b6618..1e1f390 100644
--- a/integration-tests/tests/pom.xml
+++ b/integration-tests/tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-tests-parent</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/io/pom.xml b/io/pom.xml
index 52e5413..9f62f92 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
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 89cf9a9..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.BUILD-SNAPSHOT</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/mock/pom.xml b/mock/pom.xml
index f9ee25b..0514779 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 2282299..3f1786b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
<!-- Note: When updating the version, ensure it is a valid OSGi version -->
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<packaging>pom</packaging>
<name>Gemini Blueprint</name>
<url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -29,7 +29,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Spring version -->
- <spring.maven.artifact.version>4.2.4.RELEASE_1</spring.maven.artifact.version>
+ <spring.maven.artifact.version>4.2.5.RELEASE_1</spring.maven.artifact.version>
<spring.base.version>4.2.0</spring.base.version>
<symName.prefix>org.eclipse.gemini.blueprint</symName.prefix>
@@ -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 -->
@@ -105,6 +105,7 @@
<!--</ciManagement>-->
<scm>
+ <url>http://git.eclipse.org/c/gemini.blueprint/org.eclipse.gemini.blueprint.git/</url>
<connection>scm:git:git//git.eclipse.org/gitroot/gemini.blueprint/org.eclipse.gemini.blueprint.git</connection>
<developerConnection>scm:git:ssh://{user.name}@git.eclipse.org/gitroot/gemini.blueprint/org.eclipse.gemini.blueprint.git</developerConnection>
</scm>
@@ -175,7 +176,6 @@
<!-- modules for Spring-OSGi -->
<modules>
- <module>lib/equinox</module>
<module>mock</module>
<module>io</module>
<module>core</module>
@@ -274,7 +274,7 @@
</dependency>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
+ <groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.ver}</version>
</dependency>
@@ -455,6 +455,56 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
+ <overview>${javadoc.loc}/overview.html</overview>
+ <groups>
+ <group>
+ <title>OSGi Blueprint Service</title>
+ <packages>org.osgi.service.blueprint*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Core</title>
+ <packages>org.eclipse.gemini.blueprint*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Extender</title>
+ <packages>org.eclipse.gemini.blueprint.extender*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint IO</title>
+ <packages>org.eclipse.gemini.blueprint.io*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
+ <packages>org.eclipse.gemini.blueprint.test*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Mock</title>
+ <packages>org.eclipse.gemini.blueprint.mock*</packages>
+ </group>
+ </groups>
+ <excludePackageNames>
+ *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
+ </excludePackageNames>
+
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <show>protected</show>
+ <source>1.7</source>
+ <links>
+ <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://docs.spring.io/autorepo/docs/spring-framework/4.2.x/javadoc-api/</link>
+ <link>http://www2.osgi.org/javadoc/r4/</link>
+ <link>http://cglib.sourceforge.net/apidocs</link>
+ <!--<link>http://logging.apache.org/log4j/docs/api/</link>-->
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://junit.org/junit/javadoc/4.9.0/</link>
+ <link>http://aopalliance.sourceforge.net/doc/</link>
+ </links>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -641,56 +691,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
- <overview>${javadoc.loc}/overview.html</overview>
- <groups>
- <group>
- <title>OSGi Blueprint Service</title>
- <packages>org.osgi.service.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Core</title>
- <packages>org.eclipse.gemini.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Extender</title>
- <packages>org.eclipse.gemini.blueprint.extender*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint IO</title>
- <packages>org.eclipse.gemini.blueprint.io*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
- <packages>org.eclipse.gemini.blueprint.test*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Mock</title>
- <packages>org.eclipse.gemini.blueprint.mock*</packages>
- </group>
- </groups>
- <excludePackageNames>
- *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
- </excludePackageNames>
-
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <show>protected</show>
- <source>1.7</source>
- <links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
- <link>http://docs.spring.io/autorepo/docs/spring-framework/4.2.x/javadoc-api/</link>
- <link>http://www2.osgi.org/javadoc/r4/</link>
- <link>http://cglib.sourceforge.net/apidocs</link>
- <!--<link>http://logging.apache.org/log4j/docs/api/</link>-->
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://junit.org/junit/javadoc/4.9.0/</link>
- <link>http://aopalliance.sourceforge.net/doc/</link>
- </links>
- </configuration>
</plugin>
<plugin>
@@ -837,8 +837,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>
@@ -933,6 +934,51 @@
</dependencies>
</profile>
+
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>false</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
@@ -947,18 +993,14 @@
<name>www.eclipse.org/gemini/blueprint</name>
<url>http://www.eclipse.org/gemini/blueprint/</url>
</site>
- <repository>
- <id>repo.eclipse.org</id>
- <name>Project Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/gemini-blueprint-releases/</url>
- </repository>
<snapshotRepository>
- <!-- makes it simpler for virgo to consumer specific snapshots -->
- <uniqueVersion>true</uniqueVersion>
- <id>repo.eclipse.org</id>
- <name>Project Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/gemini-blueprint-snapshots/</url>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
+ <repository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
</distributionManagement>
@@ -1020,13 +1062,7 @@
<name>knopflerfish repo</name>
<url>http://www.knopflerfish.org/maven2/</url>
</repository>
- <!--
- <repository>
- <id>dmitry-local</id>
- <name>Just Cause equinox 3.7.2 is not in central</name>
- <url>http://localhost:9091/nexus/content/repositories/thirdparty/</url>
- </repository>
- -->
+
<repository>
<id>com.springsource.repository.bundles.release</id>
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
diff --git a/release/pom.xml b/release/pom.xml
index bbd5a88..d0cf485 100755
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>..</relativePath>
</parent>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index ba8347e..abc8410 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -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>
diff --git a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
index ce2f092..fff2024 100644
--- a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
+++ b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
@@ -20,7 +20,7 @@
ignore.logback.version=1.0.13
ignore.spring.version=4.2.4.RELEASE_1
-ignore.gemini.blueprint.version=2.0.0.BUILD-SNAPSHOT
+ignore.gemini.blueprint.version=2.0.0.RELEASE
ignore.slf4j.version=1.7.5
ignore.asm.version=2.2.3
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar
deleted file mode 100644
index 9225cc5..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.md5
deleted file mode 100644
index 4f82fb2..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-de2462a33d7451f9e55be30ea86530ff
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.sha1
deleted file mode 100644
index bb25c50..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cf34f03fd1a08e6d184725e5a6f88a7fba57b5f8
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar
deleted file mode 100644
index 26cfbf3..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.md5
deleted file mode 100644
index cc5529b..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-87e3d2f6ed0aa0717d0a2d61fb1da7a6
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.sha1
deleted file mode 100644
index 3172772..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fac8156e6289582fc5f1df8db29a00c31cb7c79b
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar
deleted file mode 100644
index 97e8292..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.md5
deleted file mode 100644
index da28733..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-4059cb66e1839c4130a9e2a25a9d8acc
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.sha1
deleted file mode 100644
index c26bc9f..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e6deb58e643d15d19b414391a1b2625c33873c1
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom
deleted file mode 100644
index b6638ba..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom
+++ /dev/null
@@ -1,84 +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.M01</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
- <packaging>jar</packaging>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- <name>Gemini Blueprint Core</name>
- <description>
- Eclipse Gemini Blueprint core classes. Offers OSGi-based application context and importer/exporter
- functionality.
- </description>
-
- <properties>
- <javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
- <spring.osgi.symbolic.name>${symName.prefix}.core</spring.osgi.symbolic.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>multithreadedtc</groupId>
- <artifactId>multithreadedtc</artifactId>
- <version>1.01</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.md5
deleted file mode 100644
index 1bd4211..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-5cc4723dec6d9f27fff2fea598fb6af0
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.sha1
deleted file mode 100644
index 33841a7..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/2.0.0.M01/gemini-blueprint-core-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bf46e946ce21ee72f98df0fc9b472b6273be0ae5
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml
deleted file mode 100644
index cd18056..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112607</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.md5
deleted file mode 100644
index 46e23a2..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-fa9c2ce43ec503307a752de475bffd0d
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.sha1
deleted file mode 100644
index 7ed6bdb..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-core/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58e2299978c03e9d755d4028d4a4e586c061102d
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar
deleted file mode 100644
index 83247d0..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.md5
deleted file mode 100644
index 9356756..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-5e3b5828a320d434316b1d3d426fa606
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.sha1
deleted file mode 100644
index fb8d3b3..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f897ad3688477ecd6a06d1d1ea0f7a44b94967b
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar
deleted file mode 100644
index fea3847..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.md5
deleted file mode 100644
index ceb2f89..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-443284f2e02fb5b0f0dede7a23a5e3ce
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.sha1
deleted file mode 100644
index 1cc71da..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7710ef9c39a4d301d4b789601e8f169696461f4
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar
deleted file mode 100644
index b6c776b..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.md5
deleted file mode 100644
index d8e34e4..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-5391f9a91e69c62551e320019d77556f
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.sha1
deleted file mode 100644
index 3104519..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2c171c0283980861ee29a594d9d185ea68c9cef8
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom
deleted file mode 100644
index 2074c5a..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom
+++ /dev/null
@@ -1,57 +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.M01</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
- <packaging>jar</packaging>
- <name>Gemini Blueprint Extender</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
-
- <description>
- Eclipse Gemini Blueprint extender. Listens for and bootstraps OSGi 4.2 Blueprint and Spring-powered OSGi
- bundles.
- </description>
-
- <properties>
- <javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
- <spring.osgi.symbolic.name>${symName.prefix}.extender</spring.osgi.symbolic.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.md5
deleted file mode 100644
index 3782cd9..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-6e82e68e76a1bdbcadd0561d5f4509e9
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.sha1
deleted file mode 100644
index 2730ce6..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/2.0.0.M01/gemini-blueprint-extender-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-842a65868d1c1253a3cf50fef4b31e24b0761fd1
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml
deleted file mode 100644
index cb12f9d..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112609</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.md5
deleted file mode 100644
index 7e9d2ca..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-a93b2a85f648ef95cd766ddf55da934f
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.sha1
deleted file mode 100644
index 727befb..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-extender/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-893246d172ff3f47fb9897f4885d1ce7004a2056
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar
deleted file mode 100644
index ed03a27..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.md5
deleted file mode 100644
index 5498576..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-eb78ca188e40383ce29d23baed7e37fd
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.sha1
deleted file mode 100644
index 397d748..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-263258147bfee7716e93ab331dd264bbaf41752c
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar
deleted file mode 100644
index 65af713..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.md5
deleted file mode 100644
index 8af26d4..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-2119b89ee6f2d119f480fe3094727719
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.sha1
deleted file mode 100644
index f817e10..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-98204287679216221d7c1737cd47e18eece490f5
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar
deleted file mode 100644
index da6ef77..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.md5
deleted file mode 100644
index 7695ae4..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-41dcb6a6f1c9e166857fa3c32018a17d
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.sha1
deleted file mode 100644
index 07c9e40..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b768b344f4d28ceaf1711c63ea338bb52bbe14d
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom
deleted file mode 100644
index f29620f..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom
+++ /dev/null
@@ -1,42 +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.M01</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
- <packaging>jar</packaging>
- <name>Gemini Blueprint IO</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- <description>
- Eclipse Gemini Blueprint IO abstract classes. Provides Resource, ResourceLoader and ResourcePatternResolver for
- OSGi environments.
- </description>
-
- <properties>
- <javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
- <spring.osgi.symbolic.name>${symName.prefix}.io</spring.osgi.symbolic.name>
- <bundlor.enabled>true</bundlor.enabled>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.md5
deleted file mode 100644
index b34cbc7..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-4991cd7882c3f5654a3b75637b968da3
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.sha1
deleted file mode 100644
index eaa8f2f..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/2.0.0.M01/gemini-blueprint-io-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b2bcfb3f4a77858330df8586c203e172b85a3ab2
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml
deleted file mode 100644
index bf49a82..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112601</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.md5
deleted file mode 100644
index 8daa4eb..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-540a870d7b5d28a394093f651d2a9d9f
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.sha1
deleted file mode 100644
index c6230b4..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-io/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b74e333a6bb7d5c0d26f45956d0a4f9c38115d67
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar
deleted file mode 100644
index 4812155..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.md5
deleted file mode 100644
index dbb13ef..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-397aaa7b3801a82c7a96c0c87054fa5d
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.sha1
deleted file mode 100644
index 7c02898..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3d7b4fc63589007ac13fbac69b97536c66801402
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar
deleted file mode 100644
index 174e30d..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.md5
deleted file mode 100644
index 7cc1a59..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a4b5efaa0b1bc5c26c191e892eeb05b1
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.sha1
deleted file mode 100644
index 1b70228..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7403f4394a4813b269f1f846e736dc481291f97f
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar
deleted file mode 100644
index 8042e73..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.md5
deleted file mode 100644
index 2bc38c5..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-652c4e4e2567037777ac93e8fce22c00
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.sha1
deleted file mode 100644
index 32fdb79..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6abf19967b400923755ec0ffd499d30dcd44ebc
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom
deleted file mode 100644
index 137d316..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom
+++ /dev/null
@@ -1,26 +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.M01</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>gemini-blueprint-mock</artifactId>
- <packaging>jar</packaging>
- <name>Gemini Blueprint Mocks</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- <description>Mocks for OSGi interfaces.</description>
-
- <properties>
- <javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
- <spring.osgi.symbolic.name>${symName.prefix}.mock</spring.osgi.symbolic.name>
- <bundlor.enabled>true</bundlor.enabled>
- </properties>
-
-</project>
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.md5
deleted file mode 100644
index 7d29dfe..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-7fce93b439aa009bffa47e80f9502e6c
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.sha1
deleted file mode 100644
index 3ee3b5a..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/2.0.0.M01/gemini-blueprint-mock-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-75bf6372c0e1cc6599a31a4c5aa234b63cf7504c
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml
deleted file mode 100644
index 6168832..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112559</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.md5
deleted file mode 100644
index ee2589a..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-a5f158b0d7ce05868124809b8737136a
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.sha1
deleted file mode 100644
index 6bad86a..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-mock/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53e0638aba2e7a3e6f79535943d828944cf44a15
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar
deleted file mode 100644
index 24746a5..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.md5
deleted file mode 100644
index f38ca1c..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-87a53342e1c2d558cf889941a26e21ee
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.sha1
deleted file mode 100644
index 5999add..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-javadoc.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05a03f1d18ec47c036699c346a1c17e68ac78475
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar
deleted file mode 100644
index 5f84a79..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.md5
deleted file mode 100644
index cd0230a..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-92111eb5b6ba75dd1efcabaff6a82e94
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.sha1
deleted file mode 100644
index 4406a8e..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c455678ab63800e01b54085aeba03314cebb0363
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar
deleted file mode 100644
index 992d6de..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar
+++ /dev/null
Binary files differ
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.md5
deleted file mode 100644
index 70ac5ce..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-c5b06ddfb703953ee0caea709e3ccb95
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.sha1
deleted file mode 100644
index 89a7cee..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24c6922ccba9b3321fa819f84db179922c499008
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom
deleted file mode 100644
index af429f2..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom
+++ /dev/null
@@ -1,154 +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.M01</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-test</artifactId>
- <packaging>jar</packaging>
- <name>Gemini Blueprint Testing Framework</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- <description>
- Eclipse Gemini Blueprint testing framework. Provides JUnit based integration testing inside OSGi containers.
- </description>
-
-
- <properties>
- <javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
-
- <spring.osgi.symbolic.name>${symName.prefix}.test</spring.osgi.symbolic.name>
-
- <jarjar.run>on</jarjar.run>
- <jarjar.keep>org.eclipse.gemini.blueprint.test.**</jarjar.keep>
- <jarjar.dep>${maven.dependency.org.eclipse.gemini.blueprint.gemini-blueprint-extender.jar.path}</jarjar.dep>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <version>4.9.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <!-- exclude spring-test junit (3.8.1) -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>2.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <!-- used for getting Counter util in -->
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.knopflerfish</groupId>
- <artifactId>framework</artifactId>
- <version>${kf.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${felix.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- required since starting multiple osgi platforms inside the same VM might is not recommended -->
- <!-- (for example multiple URL stream factories might be registered) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
-
- <systemProperties>
- <property>
- <name>org.eclipse.gemini.blueprint.test.framework</name>
- <value>${osgi.test.platform}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.md5
deleted file mode 100644
index 326adf4..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-25985281034fb74a0efe99d17e43a8a4
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.sha1
deleted file mode 100644
index eed2edd..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/2.0.0.M01/gemini-blueprint-test-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e7ee48bb534d359045012b9e9785096f8f436ef7
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml
deleted file mode 100644
index 8f22381..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-test</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112613</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.md5
deleted file mode 100644
index 9afa062..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-8440e3d9a93a5be93089487df3712630
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.sha1
deleted file mode 100644
index 87850c0..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint-test/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-946e429b6949ab0ab7a078484238eae3cbd90ca4
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom
deleted file mode 100644
index d5f7fec..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom
+++ /dev/null
@@ -1,1095 +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>
-
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
-
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint</artifactId>
- <!-- Note: When updating the version, ensure it is a valid OSGi version -->
- <version>2.0.0.M01</version>
- <packaging>pom</packaging>
- <name>Gemini Blueprint</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- <description>
- Eclipse Gemini Blueprint project makes it easy to build Java applications that run in an OSGi framework. By
- using Gemini Blueprint, applications benefit from using a
- better separation of modules, the ability to dynamically add, remove, and update modules in a running system,
- the ability to deploy multiple versions of a module
- simultaneously (and have clients automatically bind to the appropriate one), and a dynamic service model.
- </description>
- <inceptionYear>2006</inceptionYear>
-
- <properties>
- <!-- Source file encoding -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <!-- Spring version -->
- <spring.maven.artifact.version>3.1.1.RELEASE</spring.maven.artifact.version>
- <spring.base.version>3.0.0</spring.base.version>
-
- <symName.prefix>org.eclipse.gemini.blueprint</symName.prefix>
- <spring.osgi.symbolic.name>${project.groupId}.${project.artifactId}</spring.osgi.symbolic.name>
-
- <spring.osgi.license.loc>..</spring.osgi.license.loc>
-
- <!-- other properties -->
- <slf4j.version>1.6.4</slf4j.version>
- <env.buildPlan></env.buildPlan>
- <env.buildNumber></env.buildNumber>
- <env.svnRevision></env.svnRevision>
-
- <!-- platform versions -->
- <equinox.ver>3.6.2.R36x_v20110210</equinox.ver>
- <kf.ver>5.3.3</kf.ver> <!-- Knopflerfish 3.5 -->
- <felix.ver>2.0.5</felix.ver>
-
- <!-- javadoc configuration -->
- <javadoc.loc>${basedir}/docs/src/javadoc</javadoc.loc>
-
- <clover.ver>3.1.4</clover.ver>
- <clover.argLine></clover.argLine>
- <clover.skip>false</clover.skip>
-
- <findbugs.skip>false</findbugs.skip>
-
- <!-- security options for integration testing -->
- <security.argLine></security.argLine>
- <policy.url>..${file.separator}policy.all</policy.url>
-
- <!-- bundlor settings -->
- <bundlor.enabled>true</bundlor.enabled>
- <!-- common version ranges -->
- <spring.version.range.nq>[${spring.base.version},4.0)</spring.version.range.nq>
- <spring.version.range>"${spring.version.range.nq}"</spring.version.range>
- <gemini.blueprint.version.range.nq>[${project.version},${project.version}]</gemini.blueprint.version.range.nq>
- <gemini.blueprint.version.range>"${gemini.blueprint.version.range.nq}"</gemini.blueprint.version.range>
- <logging.version.range>"[1.0,2.0)"</logging.version.range>
- <!-- jarjar -->
- <jarjar.keep></jarjar.keep>
- <jarjar.dep></jarjar.dep>
- <jarjar.dep.1>${jarjar.dep}</jarjar.dep.1>
- <jarjar.dep.1.exclude>**/*</jarjar.dep.1.exclude>
- </properties>
-
- <!-- ============================================= -->
- <!-- Basic configuration: JIRA, SCM, CI, devs etc. -->
- <!-- ============================================= -->
-
- <issueManagement>
- <system>Bugzilla</system>
- <url>http://bugs.eclipse.org/bugs/buglist.cgi?product=Gemini.Blueprint</url>
- </issueManagement>
-
- <ciManagement>
- <system>bamboo</system>
- <url>http://build.springframework.org/browse/OSGI-TRUNK</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>adrian.colyer@SpringSource.com</address>
- </configuration>
- </notifier>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>costin.leau@SpringSource.com</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <scm>
- <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.gemini.blueprint/trunk</connection>
- <developerConnection>scm:svn:https://dev.eclipse.org/svnroot/rt/org.eclipse.gemini.blueprint/trunk</developerConnection>
- </scm>
-
- <developers>
- <developer>
- <id>adrian-colyer</id>
- <name>Adrian Colyer</name>
- <email>adrian.colyer at SpringSource.com</email>
- <organization>SpringSource, division of VMware</organization>
- <organizationUrl>http://www.SpringSource.com</organizationUrl>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- <developer>
- <id>jconstantine</id>
- <name>Hal Hildebrand</name>
- <email>hal.hildebrand at oracle.com</email>
- <organization>Oracle</organization>
- <organizationUrl>http://www.oracle.com</organizationUrl>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-8</timezone>
- </developer>
- <developer>
- <id>costin_leau</id>
- <name>Costin Leau</name>
- <email>costin.leau at SpringSource.com</email>
- <organization>SpringSource, division of VMware</organization>
- <organizationUrl>http://www.SpringSource.com</organizationUrl>
- <roles>
- <role>Project Admin</role>
- <role>Developer</role>
- </roles>
- <timezone>+2</timezone>
- </developer>
- <developer>
- <id>andypiper</id>
- <name>Andy Piper</name>
- <email>andy at oracle.com</email>
- <organization>Oracle</organization>
- <organizationUrl>http://www.oracle.com</organizationUrl>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>0</timezone>
- </developer>
-
- </developers>
-
- <licenses>
- <license>
- <name>Eclipse Public License, Version 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <!-- =================================================== -->
- <!-- Project Modules, Dependencies, Plugins and Profiles -->
- <!-- =================================================== -->
-
- <!-- modules for Spring-OSGi -->
- <modules>
- <module>mock</module>
- <module>io</module>
- <module>core</module>
- <module>extender</module>
- <module>test-support</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <!-- Gemini Blueprint -->
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-test</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.maven.artifact.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- </dependency>
-
- </dependencies>
-
- </dependencyManagement>
-
- <!-- shared dependencies across modules -->
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- </dependency>
-
- <!-- junit -->
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <version>4.9.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- commons-logging in slf4j wrapper -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.springframework.build.aws</groupId>
- <artifactId>org.springframework.build.aws.maven</artifactId>
- <version>2.0.0.RELEASE</version>
- </extension>
- </extensions>
-
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <dependencies>
- <!-- force surefire to use new junit 4.7+ runner, it would normally auto detect this -->
- <!-- but since we're not using the official junit dependency it is unable to do so.-->
- <!-- - this makes things like @Ignore work. -->
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>2.12</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.4.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.ver}</version>
- </plugin>
- <plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <!--<version>1.0.0.RELEASE</version>-->
- <version>1.0.0.M6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.12</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>jarjar</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target if="jarjar.run">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
- classpathref="maven.plugin.classpath"/>
- <property name="dep.jar" value="${jarjar.dep}"/>
- <property name="dep.1.jar" value="${jarjar.dep.1}"/>
- <jarjar jarfile="${project.build.directory}${file.separator}${project.build.finalName}.jar">
- <fileset dir="${project.build.outputDirectory}"/>
- <zipfileset src="${dep.jar}" includes="**/*.class" excludes="META-INF/**"/>
- <zipfileset src="${dep.1.jar}" includes="${jarjar.dep.1.include}"
- excludes="META-INF/**,${jarjar.dep.1.exclude}"/>
- <keep pattern="${jarjar.keep}"/>
- </jarjar>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>com.google.jarjar</groupId>
- <artifactId>com.springsource.com.tonicsystems.jarjar</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>com.springsource.bundlor</groupId>
- <artifactId>com.springsource.bundlor.maven</artifactId>
- <executions>
- <execution>
- <id>bundlor</id>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <manifestTemplatePath>${basedir}/template.mf</manifestTemplatePath>
- <manifestHeaders><![CDATA[Bundle-Name: ${project.artifactId}
-Bundle-Version: ${project.version}
-Bundle-SymbolicName: ${spring.osgi.symbolic.name}
-Bundle-Vendor: Eclipse Foundation
-Bundle-DocURL: http://www.eclipse.org/gemini/blueprint/
-Bundle-Description: ${project.description}
-Bundle-License: http://www.opensource.org/licenses/eclipse-1.0.php, http://www.opensource.org/licenses/apache2.0.php
-Bundle-ManifestVersion: 2
-Implementation-Title: Eclipse Gemini Blueprint
-Implementation-Version: ${project.version}
-Implementation-Vendor: Eclipse Foundation
-Implementation-Vendor-Id: org.eclipse.gemini.blueprint
-Gemini-Blueprint-Version: ${project.version}
-Spring-Version: ${spring.maven.artifact.version}
-Build-Jdk: ${java.version}
-Build-Plan: ${env.buildPlan}
-Build-Number: ${env.buildNumber}
-SVN-Revision: ${env.svnRevision}
-Unversioned-Imports: *
-Excluded-Imports: com_cenqua_clover*
-Ignored-Existing-Headers:
- Ant-Version,
- Archiver-Version,
- Unversioned-Imports,
- Tool,
- Ignore-Package,
- Private-Package,
- Created-By,
- Bnd-LastModified,
- Import-Package,
- Export-Package
-]]></manifestHeaders>
-
- <packagings>
- <packaging>jar</packaging>
- </packagings>
-
- <enabled>${bundlor.enabled}</enabled>
- <failOnWarnings>false</failOnWarnings>
- <removeNullHeaders>true</removeNullHeaders>
- </configuration>
- </plugin>
-
- <!--<plugin>-->
- <!--<groupId>com.springsource.bundlor</groupId>-->
- <!--<artifactId>com.springsource.bundlor.maven</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>bundlor</id>-->
- <!--<goals>-->
- <!--<goal>bundlor</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<configuration>-->
- <!--<manifestTemplate><![CDATA[Bundle-Name: ${project.artifactId}-->
-<!--Bundle-Version: ${project.version}-->
-<!--Bundle-SymbolicName: ${spring.osgi.symbolic.name}-->
-<!--Bundle-Vendor: Eclipse Foundation-->
-<!--Bundle-DocURL: http://www.eclipse.org/gemini/blueprint/-->
-<!--Bundle-Description: ${project.description}-->
-<!--Bundle-License: http://www.opensource.org/licenses/eclipse-1.0.php, http://www.opensource.org/licenses/apache2.0.php-->
-<!--Bundle-ManifestVersion: 2-->
-<!--Implementation-Title: Eclipse Gemini Blueprint-->
-<!--Implementation-Version: ${project.version}-->
-<!--Implementation-Vendor: Eclipse Foundation-->
-<!--Implementation-Vendor-Id: org.eclipse.gemini.blueprint-->
-<!--Gemini-Blueprint-Version: ${project.version}-->
-<!--Spring-Version: ${spring.maven.artifact.version}-->
-<!--Build-Jdk: ${java.version}-->
-<!--Build-Plan: ${env.buildPlan}-->
-<!--Build-Number: ${env.buildNumber}-->
-<!--SVN-Revision: ${env.svnRevision}-->
-<!--Unversioned-Imports: *-->
-<!--Excluded-Imports: com_cenqua_clover*-->
-<!--Ignored-Existing-Headers:-->
- <!--Ant-Version,-->
- <!--Archiver-Version,-->
- <!--Unversioned-Imports,-->
- <!--Tool,-->
- <!--Ignore-Package,-->
- <!--Private-Package,-->
- <!--Created-By,-->
- <!--Bnd-LastModified,-->
- <!--Import-Package,-->
- <!--Export-Package-->
-<!--]]></manifestTemplate>-->
-
- <!--<!– Apparently this (<packagings/>) is valid config for the bundlor plugin, even through the plugin-->
- <!--descriptor disagrees –>-->
- <!--<packagings>-->
- <!--<packaging>jar</packaging>-->
- <!--</packagings>-->
-
- <!--<enabled>${bundlor.enabled}</enabled>-->
- <!--<failOnWarnings>false</failOnWarnings>-->
- <!--<removeNullHeaders>true</removeNullHeaders>-->
- <!--</configuration>-->
- <!--</plugin>-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <debug>true</debug>
- <fork>true</fork>
- </configuration>
- </plugin>
-
- <!-- clover plug-in -->
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <licenseLocation>${env.clover.licenseLocation}</licenseLocation>
- <generatePdf>false</generatePdf>
- <generateXml>true</generateXml>
- <generateHtml>true</generateHtml>
- <generateHistorical>false</generateHistorical>
- <!-- saving history is problematic since each module would override
- the previous unless a different folder is used for the root
- <historyDir>${basedir}/clover/history</historyDir>
- -->
- <jdk>1.5</jdk>
- <includesTestSourceRoots>false</includesTestSourceRoots>
- <skip>${clover.skip}</skip>
-
- <!-- exclusions -->
- <excludes>
- <!-- integration tests -->
- <exclude>org/eclipse/gemini/blueprint/iandt/**</exclude>
- <exclude>org/eclipse/gemini/blueprint/test/parsing/**</exclude>
- <!-- addressed in 1.2 -->
- <exclude>org/eclipse/gemini/blueprint/compendium/internal/**</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
-
- <!-- =============== -->
- <!-- Javadocs -->
- <!-- =============== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
- <overview>${javadoc.loc}/overview.html</overview>
- <groups>
- <group>
- <title>OSGi Blueprint Service</title>
- <packages>org.osgi.service.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Core</title>
- <packages>org.eclipse.gemini.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Extender</title>
- <packages>org.eclipse.gemini.blueprint.extender*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint IO</title>
- <packages>org.eclipse.gemini.blueprint.io*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
- <packages>org.eclipse.gemini.blueprint.test*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Mock</title>
- <packages>org.eclipse.gemini.blueprint.mock*</packages>
- </group>
- </groups>
- <excludePackageNames>
- *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
- </excludePackageNames>
-
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <show>protected</show>
- <source>1.5</source>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://static.springsource.org/spring/docs/3.0.x/javadoc-api/</link>
- <link>http://www2.osgi.org/javadoc/r4/</link>
- <link>http://asm.objectweb.org/asm223/javadoc/user</link>
- <link>http://cglib.sourceforge.net/apidocs</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://junit.org/junit/javadoc/4.9.0/</link>
- <link>http://aopalliance.sourceforge.net/doc/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <!-- ============== -->
- <!-- FindBugs -->
- <!-- ============== -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <!--
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target</xmlOutputDirectory>
- -->
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <!--
- <debug>true</debug>
- <relaxed>true</relaxed>
- -->
- <skip>${findbugs.skip}</skip>
- </configuration>
- </plugin>
-
- <!-- =========== -->
- <!-- PMD -->
- <!-- =========== -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-
- <!-- ============== -->
- <!-- jDepend -->
- <!-- ============== -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- </reportPlugins>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <!-- profiles for equinox, knoplerfish, and felix -->
- <!-- to use these profiles invoke maven with -Pprofile-name, e.g. -->
- <!-- mvn -Pfelix test -->
- <profiles>
- <profile>
- <id>equinox</id>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <properties>
- <osgi.test.platform>org.eclipse.gemini.blueprint.test.platform.EquinoxPlatform</osgi.test.platform>
- <log4j.ignoreTCL>true</log4j.ignoreTCL>
- </properties>
- </profile>
-
- <profile>
- <id>knopflerfish</id>
- <dependencies>
- <dependency>
- <groupId>org.knopflerfish</groupId>
- <artifactId>framework</artifactId>
- <version>${kf.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <properties>
- <osgi.test.platform>org.eclipse.gemini.blueprint.test.platform.KnopflerfishPlatform</osgi.test.platform>
- <log4j.ignoreTCL>true</log4j.ignoreTCL>
- <org.knopflerfish.osgi.setcontextclassloader>true</org.knopflerfish.osgi.setcontextclassloader>
- </properties>
- </profile>
-
- <profile>
- <id>felix</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${felix.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- <!-- required to prevent felix to pull in stuff -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- include the OSGi jar to allow PermissionAdmin API to be used -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <osgi.test.platform>org.eclipse.gemini.blueprint.test.platform.FelixPlatform</osgi.test.platform>
- <log4j.ignoreTCL>true</log4j.ignoreTCL>
- </properties>
- </profile>
-
- <!-- integration testing profile -->
- <profile>
- <id>it</id>
- <activation>
- <property>
- <name>env-test</name>
- </property>
- </activation>
- <modules>
- <module>integration-tests</module>
- </modules>
- </profile>
-
- <!-- Java 2 security enabled profile -->
- <profile>
- <id>security</id>
- <properties>
- <security.argLine>-Djava.security.manager -Djava.security.policy=${policy.url}</security.argLine>
- </properties>
- </profile>
-
- <!-- clover profile -->
- <profile>
- <id>clover</id>
- <properties>
- <clover.enabled>true</clover.enabled>
- <spring.decorate.osgi.import>!com_cenqua_clover*,${spring.osgi.import}</spring.decorate.osgi.import>
- <clover.argLine>
- -Xbootclasspath/a:"${settings.localRepository}${file.separator}com${file.separator}cenqua${file.separator}clover${file.separator}clover${file.separator}${clover.ver}${file.separator}clover-${clover.ver}.jar
- -Dansi.color"
- </clover.argLine>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.cenqua.clover</groupId>
- <artifactId>clover</artifactId>
- <version>${clover.ver}</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- </profile>
- </profiles>
-
-
- <!-- ======================================= -->
- <!-- Website and reporting -->
- <!-- ======================================= -->
-
- <distributionManagement>
- <downloadUrl>http://www.eclipse.org/gemini/blueprint/download/</downloadUrl>
- <site>
- <id>gemini.blueprint.home</id>
- <name>www.eclipse.org/gemini/blueprint</name>
- <url>http://www.eclipse.org/gemini/blueprint/</url>
- </site>
- <!-- TODO: Need to participate in Gemini maven repo
- <repository>
- <id>zodiac-milestone</id>
- <name>Zodiac Milestone Repository</name>
- <url>s3://zodiac.springsource.com/maven/bundles/milestone</url>
- </repository>
- <snapshotRepository>
- <id>zodiac-snapshot</id>
- <name>Zodiac Snapshot Repository</name>
- <url>s3://zodiac.springsource.com/maven/bundles/snapshot</url>
- </snapshotRepository> -->
- </distributionManagement>
-
-
- <!-- ================================================ -->
- <!-- Repository Configuration -->
- <!-- ================================================ -->
-
- <pluginRepositories>
- <pluginRepository>
- <id>maven-repo</id>
- <name>maven repo</name>
- <url>http://repo1.maven.org/maven2/</url>
- </pluginRepository>
- <!-- clover repository -->
- <pluginRepository>
- <id>atlassian-m2-repository</id>
- <name>Atlassian Maven 2.x Repository</name>
- <url>http://repository.atlassian.com/maven2</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release/</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- </pluginRepositories>
-
- <repositories>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release/</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Release</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - Snapshots</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>spring-release</id>
- <name>Spring Portfolio Release Repository</name>
- <url>http://maven.springframework.org/release</url>
- </repository>
- <repository>
- <id>spring-external</id>
- <name>Spring Portfolio External Repository</name>
- <url>http://maven.springframework.org/external</url>
- </repository>
- <repository>
- <id>spring-milestone</id>
- <name>Spring Portfolio Milestone Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
- <repository>
- <id>spring-ext</id>
- <name>Spring External Dependencies Repository</name>
- <url>http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
- </repository>
- <!-- used when building against Spring snapshots -->
- <repository>
- <id>spring-snapshot</id>
- <name>Spring Portfolio Milestone Repository</name>
- <url>http://maven.springframework.org/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>knopflerfish-repo</id>
- <name>Official Knopflerfish Repository</name>
- <url>http://www.knopflerfish.org/maven2/</url>
- </repository>
-
- <repository>
- <id>i21-s3-osgi-repo</id>
- <name>i21 osgi artifacts repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <url>http://maven.springframework.org/osgi</url>
- </repository>
- </repositories>
-
-</project>
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.md5
deleted file mode 100644
index 447962e..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-c06b6579e1a0a1e6e55f5d4b66f554bc
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.sha1
deleted file mode 100644
index 43c17f5..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/2.0.0.M01/gemini-blueprint-2.0.0.M01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-282d8ac57b5e72c5e0a1f636de98769cd68a1dec
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml
deleted file mode 100644
index 9fdf0e2..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint</artifactId>
- <versioning>
- <release>2.0.0.M01</release>
- <versions>
- <version>2.0.0.M01</version>
- </versions>
- <lastUpdated>20130212112558</lastUpdated>
- </versioning>
-</metadata>
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.md5 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.md5
deleted file mode 100644
index b3f9726..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-dd2e0e4267a9d9b5e687a3922e08117f
\ No newline at end of file
diff --git a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.sha1 b/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.sha1
deleted file mode 100644
index 9fd183c..0000000
--- a/~/scratch/mvn/gemini-blueprint/2.0.0.M01/repo/org/eclipse/gemini/blueprint/gemini-blueprint/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df8baa2b7a94c738964e71737c2d46b6255a2388
\ No newline at end of file
