https://bugs.eclipse.org/bugs/show_bug.cgi?id=359535 - added -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass to work aroud blocking in tests
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index 1e60c9d..f4a67cd 100644
--- a/integration-tests/tests/pom.xml
+++ b/integration-tests/tests/pom.xml
@@ -23,16 +23,6 @@
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.2.8</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- metatype service -->
@@ -41,33 +31,14 @@
<artifactId>org.apache.felix.metatype</artifactId>
<version>1.0.8</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <!-- event admin impl -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<version>1.3.0</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -199,19 +170,12 @@
<scope>provided</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.osgi</groupId>-->
- <!--<artifactId>org.osgi.compendium</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>component.scan.bundle</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
@@ -227,9 +191,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--<includes>-->
- <!--<include>**/ScopingTest.java</include>-->
- <!--</includes>-->
+ <!--
+ <includes>
+ <include>**/ScopingTest.java</include>
+ </includes>
+ -->
<forkMode>pertest</forkMode>
<forkedProcessTimeoutInSeconds>2700</forkedProcessTimeoutInSeconds>
<systemProperties>
@@ -250,10 +216,10 @@
<value>${project.build.testOutputDirectory}/logback-test.xml</value>
</property>
</systemProperties>
- <argLine>${clover.argLine} ${security.argLine}</argLine>
+ <argLine>${clover.argLine} ${security.argLine} -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass</argLine>
<!--argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=2111,server=y,suspend=y</argLine-->
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/integration-tests/tests/src/test/resources/logback-test.xml b/integration-tests/tests/src/test/resources/logback-test.xml
index db15e3e..7e67039 100644
--- a/integration-tests/tests/src/test/resources/logback-test.xml
+++ b/integration-tests/tests/src/test/resources/logback-test.xml
@@ -27,23 +27,13 @@
<MaxFileSize>10MB</MaxFileSize>
</triggeringPolicy>
</appender>
- <!--<logger name="org.eclipse.gemini.blueprint.test.AbstractOnTheFlyBundleCreatorTests" level="WARN"/>-->
- <!--<logger name="org.apache.felix" level="DEBUG"/>-->
<logger name="org.springframework" level="INFO"/>
- <!--<logger name="org.eclipse.gemini.blueprint.context.support.DelegatedNamespaceHandlerResolver" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.service.exporter.support.internal.support" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.service.dependency.internal" level="WARN"/>-->
- <!--<logger name="org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.iandt" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.test" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.activator" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.service.exporter.support" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.blueprint.activator.support" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.service.importer.support.internal.aop" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.support" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.blueprint" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespaceManager" level="WARN"/>-->
- <!--<logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespacePlugins" level="WARN"/>-->
+ <logger name="org.eclipse.gemini.blueprint.context.support.DelegatedNamespaceHandlerResolver" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.service.dependency.internal" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespaceManager" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespacePlugins" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.context.support.ChainedEntityResolver" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.util.BundleDelegatingClassLoader" level="INFO"/>
<root level="TRACE">
<appender-ref ref="stdout"/>
<appender-ref ref="file"/>
diff --git a/pom.xml b/pom.xml
index 13837a8..3e0ba29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,12 +317,26 @@
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.ver}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>framework</artifactId>
+ <version>${kf.ver}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.ver}</version>
<type>jar</type>
<scope>provided</scope>
- <!--<scope>system</scope>-->
- <!--<systemPath>-->
- <!--/Users/dsklyut/Projects/sources/osgi/gemini/blueprint/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar-->
- <!--</systemPath>-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -331,11 +345,6 @@
<!-- shared dependencies across modules -->
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.osgi</groupId>-->
- <!--<artifactId>org.osgi.core</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
@@ -848,6 +857,7 @@
</plugins>
</build>
+
<!-- profiles for equinox, knopflerfish, and felix -->
<!-- to use these profiles invoke maven with -Pprofile-name, e.g. -->
<!-- mvn -Pfelix test -->
@@ -858,6 +868,7 @@
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
<properties>
@@ -872,7 +883,6 @@
<groupId>org.knopflerfish</groupId>
<artifactId>framework</artifactId>
<version>${kf.ver}</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -889,7 +899,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>${felix.ver}</version>
- <type>jar</type>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 75d4d7f..fde1253 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -68,44 +68,20 @@
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <!--<version>${equinox.ver}</version>-->
- <!--<type>jar</type>-->
- <!--<scope>provided</scope>-->
- <!--<optional>true</optional>-->
+ <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 -->
@@ -120,14 +96,13 @@
<build>
<pluginManagement>
<plugins>
- <!-- required since starting multiple osgi platforms inside the same VM might is not recommended -->
+ <!-- required since starting multiple osgi platforms inside the same VM 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>
