X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.catalina.start%2Fpom.xml;h=24e080417d0f98e3bd18136a2e83dac607b797ee;hb=5defecab287b9730db6686ced952b53b8956135a;hp=7a405ebba23cd40be66e95db3a76586f3ac7721f;hpb=15d66f3c17c025e40f833a7164aa34fe69ae9fad;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.catalina.start/pom.xml b/server/runtime/org.argeo.server.catalina.start/pom.xml
index 7a405ebba..24e080417 100644
--- a/server/runtime/org.argeo.server.catalina.start/pom.xml
+++ b/server/runtime/org.argeo.server.catalina.start/pom.xml
@@ -1,10 +1,9 @@
-<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.server</groupId>
-		<version>1.1.9-SNAPSHOT</version>
-		<artifactId>modules</artifactId>
+		<version>2.1.9-SNAPSHOT</version>
+		<artifactId>runtime</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.server.catalina.start</artifactId>
@@ -17,7 +16,11 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Bundle-Activator>org.argeo.dep.osgi.catalina.start.CatalinaActivator</Bundle-Activator>
+						<Bundle-Activator>org.argeo.catalina.start.CatalinaActivator</Bundle-Activator>
+						<Import-Package>
+							javax.management;version="0.0.0",
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -25,8 +28,9 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -34,7 +38,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.apache.commons.logging</artifactId>
+			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>