X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Fpom.xml;h=64ed2d1d7d6ab4b10bfa7e64e5291c8372fc5dd3;hb=cba867a735d8de8f055b5ae158be3ed688573030;hp=3892acc4db5c9e37bf207f28ec5d30f9d7ad7711;hpb=8f39b4c0d65fd41ce4c16d809f77754cab4f4bd5;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index 3892acc4d..64ed2d1d7 100644
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 		<artifactId>server</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -14,7 +14,8 @@
 	<modules>
 		<module>org.argeo.server.core</module>
 		<module>org.argeo.server.json</module>
-		<module>org.argeo.server.osgi</module>
+		<module>org.argeo.server.catalina.start</module>
+		<module>org.argeo.server.webextender</module>
 		<module>org.argeo.server.jxl</module>
 		<module>org.argeo.server.hibernate</module>
 		<module>org.argeo.server.ads</module>
@@ -23,73 +24,4 @@
 		<module>org.argeo.server.jackrabbit</module>
 		<module>org.argeo.server.modeshape</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>META-INF</directory>
-							<includes>
-								<include>MANIFEST.MF</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-					<instructions>
-						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-						<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-						<_removeheaders>Bnd-LastModified</_removeheaders>
-					</instructions>
-				</configuration>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file