X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.server%2Fpom.xml;h=0f629a7fd1add20d5a3322aaef6bbe8b3f4c864a;hb=311e3310d1a9bd9d66553b5d647762e0a3adbdbc;hp=4e46996aca67cbf4f8fa199ed0a2a477df30a360;hpb=00d3470e42c5701482d6b6e9faf45d775295f76d;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 4e46996ac..0f629a7fd 100644
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -1,4 +1,3 @@
-<?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">
@@ -6,10 +5,10 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.9.3-SNAPSHOT</version>
+		<version>0.11.2-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
-	<artifactId>argeo-slc-server</artifactId>
+	<artifactId>org.argeo.slc.server</artifactId>
 	<name>Argeo SLC Server</name>
 	<description>SLC Server</description>
 	<build>
@@ -23,6 +22,21 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.argeo.slc.*
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
@@ -30,13 +44,9 @@
 					<webAppSourceDirectory>
 						../org.argeo.slc.webapp/src/main/webapp
 					</webAppSourceDirectory>
-					<systemProperties>
-						<systemProperty>
-							<!-- some library (JExcelAPi) include log4j config in their jar -->
-							<name>log4j.defaultInitOverride</name>
-							<value>true</value>
-						</systemProperty>
-					</systemProperties>
+					<jettyConfig>
+						../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+					</jettyConfig>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -44,7 +54,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-core</artifactId>
+			<artifactId>org.argeo.slc.core</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
@@ -55,7 +65,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-hibernate</artifactId>
+			<artifactId>org.argeo.slc.hibernate</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
@@ -67,46 +77,49 @@
 
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
+			<artifactId>
+				com.springsource.javax.servlet.jsp.jstl
+			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>
+				com.springsource.org.apache.taglibs.standard
+			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-ws-core</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>org.springframework.ws</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<scope>provided</scope>
+			<artifactId>org.springframework.web.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>c3p0</groupId>
-			<artifactId>c3p0</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.aop</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
+			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
-			<artifactId>jxl</artifactId>
-			<version>2.6.3</version>
+			<artifactId>com.springsource.jxl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.lowagie</groupId>
-			<artifactId>itext</artifactId>
-			<version>2.1.2</version>
+			<groupId>com.lowagie.text</groupId>
+			<artifactId>com.springsource.com.lowagie.text</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.wsdl</groupId>
+			<artifactId>com.springsource.javax.wsdl</artifactId>
+		</dependency>
+
 	</dependencies>
-</project>
\ No newline at end of file
+</project>