From c1742bece3a0d15600aa9212f3a07df9be1d70d2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 27 Mar 2012 14:34:25 +0000
Subject: [PATCH] Introduce check-osgi profile

git-svn-id: https://svn.argeo.org/commons/trunk@5244 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml | 68 +++++++++----------
 eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml | 28 +++++++-
 eclipse/dep/pom.xml                           | 37 ++++------
 osgi/dep/pom.xml                              | 66 ++++++++++--------
 osgi/plugins/pom.xml                          |  9 +++
 .../argeo/osgi/boot/OsgiBootRuntimeTest.java  | 12 +++-
 .../org.argeo.security.dep.node.rap/pom.xml   | 42 +++++++++---
 .../org.argeo.security.dep.node.rcp/pom.xml   | 45 +++++++++---
 .../dep/org.argeo.security.dep.node/pom.xml   | 61 +++++++++++------
 server/dep/pom.xml                            | 66 ++++++++++--------
 .../plugins/org.argeo.jcr.ui.explorer/pom.xml |  1 +
 server/plugins/pom.xml                        |  9 +++
 12 files changed, 285 insertions(+), 159 deletions(-)

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
index 66bb5b13c..fd7a98f6d 100644
--- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 		<groupId>org.argeo.commons.eclipse</groupId>
@@ -93,21 +94,12 @@
 			<artifactId>org.eclipse.rap.ui.workbench</artifactId>
 		</dependency>
 
-		<!-- Jetty (TO BE REMOVED and replaced by Tomcat
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>org.mortbay.jetty.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>org.mortbay.jetty.util</artifactId>
-		</dependency>
-		 -->
-		 
+		<!-- Jetty (TO BE REMOVED and replaced by Tomcat <dependency> <groupId>org.eclipse.equinox</groupId> 
+			<artifactId>org.eclipse.equinox.http.jetty</artifactId> </dependency> <dependency> 
+			<groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.server</artifactId> 
+			</dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.util</artifactId> 
+			</dependency> -->
+
 		<!-- Eclipse -->
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
@@ -119,28 +111,33 @@
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
-<!-- 					<plugin> -->
-<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
-<!-- 						<executions> -->
-<!-- 							<execution> -->
-<!-- 								<id>copy-rap</id> -->
-<!-- 								<phase>package</phase> -->
-<!-- 								<goals> -->
-<!-- 									<goal>copy-dependencies</goal> -->
-<!-- 								</goals> -->
-<!-- 								<configuration> -->
-<!-- 									<includeTypes>jar</includeTypes> -->
-<!-- 									<includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
-<!-- 									<outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
-<!-- 								</configuration> -->
-<!-- 							</execution> -->
-<!-- 						</executions> -->
-<!-- 					</plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -179,7 +176,8 @@
 								<configuration>
 									<target>
 										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
index f98693bda..1ad10a690 100644
--- a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 		<groupId>org.argeo.commons.eclipse</groupId>
@@ -97,4 +98,29 @@ ex=*.source_*.jar,\
 			<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/eclipse/dep/pom.xml b/eclipse/dep/pom.xml
index 36a3fd15e..d1f43702f 100644
--- a/eclipse/dep/pom.xml
+++ b/eclipse/dep/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 		<groupId>org.argeo.commons.eclipse</groupId>
@@ -53,30 +54,22 @@
 							</goals>
 							<phase>generate-resources</phase>
 						</execution>
-						<execution>
-							<id>check-osgi</id>
-							<phase>test</phase>
-							<goals>
-								<goal>equinox</goal>
-							</goals>
-							<configuration>
-								<onlyCheck>true</onlyCheck>
-								<argsToAppend>
-									<arg>-clean</arg>
-								</argsToAppend>
-							</configuration>
-						</execution>
 					</executions>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.3.5-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/osgi/dep/pom.xml b/osgi/dep/pom.xml
index 3b9ac15ca..481b2caa0 100644
--- a/osgi/dep/pom.xml
+++ b/osgi/dep/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 		<groupId>org.argeo.commons</groupId>
@@ -15,33 +16,38 @@
 		<module>org.argeo.osgi.dep.stdruntime</module>
 		<module>org.argeo.osgi.dep.jackrabbit</module>
 	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- OSGi test -->
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.3.5-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/osgi/plugins/pom.xml b/osgi/plugins/pom.xml
index b13973fb3..03d0dfd1d 100644
--- a/osgi/plugins/pom.xml
+++ b/osgi/plugins/pom.xml
@@ -43,6 +43,15 @@
 					</excludes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
index 0f2eb7d32..fd32f1ae0 100644
--- a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
@@ -21,7 +21,6 @@ import java.util.TreeMap;
 
 import junit.framework.TestCase;
 
-import org.argeo.osgi.boot.OsgiBoot;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -29,8 +28,14 @@ import org.osgi.framework.BundleContext;
 /** Starts an Equinox runtime and provision it with OSGi boot. */
 public class OsgiBootRuntimeTest extends TestCase {
 	protected OsgiBoot osgiBoot = null;
+	private boolean osgiRuntimeAlreadyRunning = false;
 
 	public void testInstallAndStart() throws Exception {
+		if (osgiRuntimeAlreadyRunning) {
+			System.out
+					.println("OSGi runtime already running, skipping test...");
+			return;
+		}
 		osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
 				OsgiBootNoRuntimeTest.BUNDLES));
 		Map map = new TreeMap(osgiBoot.getBundlesBySymbolicName());
@@ -71,11 +76,16 @@ public class OsgiBootRuntimeTest extends TestCase {
 	}
 
 	public void setUp() throws Exception {
+		osgiRuntimeAlreadyRunning = EclipseStarter.isRunning();
+		if (osgiRuntimeAlreadyRunning)
+			return;
 		BundleContext bundleContext = startRuntime();
 		osgiBoot = new OsgiBoot(bundleContext);
 	}
 
 	public void tearDown() throws Exception {
+		if (osgiRuntimeAlreadyRunning)
+			return;
 		osgiBoot = null;
 		stopRuntime();
 	}
diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index 61d178d26..221023d17 100644
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -21,16 +21,6 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -74,6 +64,38 @@
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
diff --git a/security/dep/org.argeo.security.dep.node.rcp/pom.xml b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
index af3f45b3e..9bc9da4e8 100644
--- a/security/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
 		<groupId>org.argeo.commons.security</groupId>
@@ -21,16 +22,6 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -49,6 +40,38 @@
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 7b9eeba17..bdae6ee06 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
 		<groupId>org.argeo.commons.security</groupId>
@@ -21,16 +22,6 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -115,14 +106,14 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.springframework</groupId> -->
-<!-- 			<artifactId>org.springframework.orm</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.springframework</groupId> -->
-<!-- 			<artifactId>org.springframework.jdbc</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.springframework</groupId> -->
+		<!-- <artifactId>org.springframework.orm</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.springframework</groupId> -->
+		<!-- <artifactId>org.springframework.jdbc</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.jms</artifactId>
@@ -297,6 +288,38 @@
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index bb5be6047..e18a927ec 100644
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 		<groupId>org.argeo.commons</groupId>
@@ -19,33 +20,38 @@
 		<module>org.argeo.server.dep.jackrabbit.server</module>
 		<module>org.argeo.server.dep.activemq</module>
 	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- OSGi test -->
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.3.5-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>0.3.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
index 1f3533674..65285df49 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
@@ -26,6 +26,7 @@
 						<Import-Package>
 							*,
 							org.argeo.eclipse.spring,
+							org.argeo.util.crypto,
 						</Import-Package>
 						<Export-Package>org.argeo.jcr.ui.explorer.*</Export-Package>
 					</instructions>
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index 113b81a26..419d41493 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -47,6 +47,15 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
-- 
2.30.2