From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 25 Oct 2012 16:18:49 +0000 (+0000)
Subject: Simplify Maven configurations
X-Git-Tag: argeo-slc-2.1.7~584
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2599d7187ce8b15ef9b9c6e0bf3292bf25cf9a46;p=gpl%2Fargeo-slc.git

Simplify Maven configurations

git-svn-id: https://svn.argeo.org/slc/trunk@5655 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/archetypes/org.argeo.slc.executionmodule/pom.xml b/archetypes/org.argeo.slc.executionmodule/pom.xml
index 71c6891f2..338a0e4fd 100644
--- a/archetypes/org.argeo.slc.executionmodule/pom.xml
+++ b/archetypes/org.argeo.slc.executionmodule/pom.xml
@@ -9,12 +9,4 @@
 	</parent>
 	<artifactId>org.argeo.slc.executionmodule</artifactId>
 	<name>SLC Basic Project Archetype</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 0f7afff1a..5849423c3 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -16,17 +16,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>META-INF</directory>
-							<includes>
-								<include>MANIFEST.MF</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index a3a3e541a..ad1e44b89 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -1,10 +1,11 @@
-<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.slc</groupId>
-		<artifactId>demo</artifactId>
+		<!-- Note: parent is SLC Lib -->
+		<artifactId>lib</artifactId>
 		<version>1.1.4-SNAPSHOT</version>
-		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>modules</artifactId>
@@ -18,65 +19,4 @@
 		<module>org.argeo.slc.demo.maven</module>
 		<module>org.argeo.slc.demo.minimal</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>.*</exclude>
-					<exclude>pom.xml</exclude>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ExecutionModule>default</SLC-ExecutionModule>
-						<!-- Minimal imports -->
-						<Import-Package>
-							*,
-							net.sf.cglib.core,
-							net.sf.cglib.proxy,
-							net.sf.cglib.reflect,
-							org.aopalliance.aop,
-							org.argeo.slc.core.execution,
-							org.argeo.slc.core.execution.tasks,
-							org.argeo.slc.execution,
-							org.argeo.slc.osgi,
-							org.argeo.slc.test,
-							org.springframework.aop,
-							org.springframework.aop.framework,
-							org.springframework.aop.scope,
-							org.springframework.beans.factory.config,
-							org.springframework.core.io,						
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-			<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>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/demo/pom.xml b/demo/pom.xml
index c20440b74..00d8510ab 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -12,232 +12,4 @@
 	<modules>
 		<module>modules</module>
 	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<configuration>
-					<argsToAppend>
-						<arg>-clean</arg>
-					</argsToAppend>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>server</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/server</execDir>
-							<systemPropertiesFile>server.properties</systemPropertiesFile>
-							<systemProperties>
-								<log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
-								<argeo.osgi.bundles>
-									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.server</groupId>
-					<artifactId>org.argeo.slc.ria</artifactId>
-				</dependency>
-
-			</dependencies>
-		</profile>
-		<profile>
-			<id>server_jcr</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/server</execDir>
-							<systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
-							<systemProperties>
-								<log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
-								<argeo.osgi.bundles>
-									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.server</groupId>
-					<artifactId>org.argeo.slc.ria</artifactId>
-				</dependency>
-
-			</dependencies>
-		</profile>
-		<profile>
-			<id>agent</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/agent</execDir>
-							<systemPropertiesFile>agent.properties</systemPropertiesFile>
-							<systemProperties>
-								<argeo.osgi.bundles>
-									${basedir}/site;in=*;ex=pom.xml;ex=target,
-									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.agent</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>slc_gis_position</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/agent</execDir>
-							<systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
-							<systemProperties>
-								<argeo.osgi.bundles>
-									${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.gis</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>detached</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/detached</execDir>
-							<fork>true</fork>
-							<systemProperties>
-								<argeo.osgi.start>
-									org.springframework.osgi.extender,
-									org.argeo.slc.detached,
-									org.argeo.slc.demo.det
-								</argeo.osgi.start>
-								<argeo.osgi.bundles>
-									${basedir}/site;in=org.argeo.slc.demo.det;ex=pom.xml;ex=target,
-									${basedir}/site;in=org.argeo.slc.demo.log4j;ex=pom.xml;ex=target,
-								</argeo.osgi.bundles>
-								<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.detached</artifactId>
-					<version>${version.slc}</version>
-				</dependency>
-				<dependency>
-					<groupId>net.sourceforge.mx4j</groupId>
-					<artifactId>com.springsource.mx4j</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>org.eclipse.osgi</groupId>
-					<artifactId>org.eclipse.osgi</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>server_mysql</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
-						<configuration>
-							<execDir>target/exec/server</execDir>
-							<jvmArgs>
-								<jvmArg>-Xmx256m</jvmArg>
-								<!--
-									<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
-								-->
-							</jvmArgs>
-							<systemProperties>
-								<argeo.osgi.start>
-									org.argeo.dep.osgi.catalina.start,
-									org.springframework.osgi.extender,
-									org.springframework.osgi.web.extender,
-									org.springframework.osgi.samples.simplewebapp,
-									org.argeo.slc.server.activemq,
-									org.argeo.slc.server.mysql,
-									org.argeo.slc.server.hibernate,
-									org.argeo.slc.server.services,
-									org.argeo.slc.server.jms,
-									org.argeo.slc.webapp,
-									org.argeo.slc.ria
-								</argeo.osgi.start>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.dep</groupId>
-					<version>${version.slc}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.argeo.slc.server</groupId>
-					<artifactId>org.argeo.slc.ria</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
 </project>
diff --git a/dep/pom.xml b/dep/pom.xml
index 6060a63db..d8acf8495 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -18,14 +18,6 @@
 		<module>org.argeo.slc.dep.rap</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>*.inf</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
diff --git a/lib/pom.xml b/lib/pom.xml
index d75a79456..b53cc9447 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>lib</artifactId>
 	<packaging>pom</packaging>
 	<name>SLC Standard Libs</name>
-	<description>SLC execution modules for generic tasks</description>
+	<description>SLC execution modules for generic tasks, to be used as parent pom</description>
 	<properties>
 		<additionalImports.slc-lib>
 			com.jcraft.jsch;resolution:=optional,
@@ -26,6 +26,7 @@
 				</includes>
 				<excludes>
 					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
 					<exclude>pom.xml</exclude>
 					<exclude>build.properties</exclude>
 				</excludes>
@@ -60,23 +61,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<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>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/modules/pom.xml b/modules/pom.xml
index e28a69455..14a225551 100644
--- a/modules/pom.xml
+++ b/modules/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.slc</groupId>
@@ -26,33 +27,11 @@
 				</includes>
 				<excludes>
 					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
 					<exclude>pom.xml</exclude>
 					<exclude>build.properties</exclude>
 				</excludes>
 			</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>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-		</plugins>
 	</build>
 </project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c6a096baf..fa8a8d8be 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -16,39 +16,7 @@
 		<module>org.argeo.slc.client.rap</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>icons/**</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.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 88944a8df..e550f6b09 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -28,57 +28,4 @@
 		<module>org.argeo.slc.lib.detached</module>
 		<module>org.argeo.slc.repo</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-					<include>*.properties</include>
-				</includes>
-				<excludes>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</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>
-			</plugin>
-		</plugins>
-	</build>
 </project>