From 97fe9c6ced5eff0002c11faa7b69e0e4272f10c9 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 17 Jan 2011 10:34:24 +0000
Subject: [PATCH] Fix for Maven 3

git-svn-id: https://svn.argeo.org/slc/trunk@4047 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.server/pom.xml |  18 ++--
 dist/org.argeo.slc.sdk/pom.xml       | 149 +++++++--------------------
 pom.xml                              |   7 ++
 runtime/pom.xml                      |  18 +---
 4 files changed, 54 insertions(+), 138 deletions(-)

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 3fd01d479..e8dd1f23b 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -53,6 +53,12 @@
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.modules</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
 
 		<!-- Security -->
 		<dependency>
@@ -114,18 +120,6 @@
 			<artifactId>org.argeo.security.dep.ads</artifactId>
 			<type>pom</type>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.modules</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.modules</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads</artifactId>
diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index e60e73a88..2981d9c03 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/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>
@@ -109,72 +110,31 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
-				<executions> <execution> <id>create-repository</id>
-				<phase>deploy</phase> <goals> <goal>exec</goal> </goals>
-				</execution> </executions> <configuration>
-				<executable>${argeo.p2.cmd}</executable> optional
-				<workingDirectory>/tmp</workingDirectory> <arguments>
-				<argument>-noSplash</argument> <argument>-application</argument>
-				<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
-				<argument>-metadataRepository</argument>
-				<argument>file:${argeo.p2.repository}</argument>
-				<argument>-artifactRepository</argument>
-				<argument>file:${argeo.p2.repository}</argument>
-				<argument>-bundles</argument>
-				<argument>${project.build.directory}</argument>
-				<argument>-features</argument>
-				<argument>${project.build.directory}</argument>
-				<argument>-compress</argument>
-				<argument>-publishArtifacts</argument> </arguments> </configuration>
-				</plugin>
-			-->
-			<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>p2-copyToRepo</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<mkdir dir="${project.build.directory}/repobase" />
-								<copy todir="${project.build.directory}/repobase">
-									<fileset dir="${project.build.directory}/lib">
-										<include name="*.jar" />
-									</fileset>
-									<fileset dir="${project.build.directory}/libsrc">
-										<include name="*.jar" />
-									</fileset>
-								</copy>
-								<exec executable="${argeo.p2.cmd}">
-									<arg value="-noSplash" />
-									<arg value="-application" />
-									<arg value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
-									<arg value="-metadataRepository" />
-									<arg value="file:${argeo.p2.repository}" />
-									<arg value="-artifactRepository" />
-									<arg value="file:${argeo.p2.repository}" />
-									<arg value="-bundles" />
-									<arg value="${project.build.directory}/repobase" />
-									<arg value="-features" />
-									<arg value="${project.build.directory}/repobase" />
-									<arg value="-compress" />
-									<arg value="-publishArtifacts" />
-								</exec>
-
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			 -->
+			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
+				<version>1.1</version> <executions> <execution> <id>create-repository</id> 
+				<phase>deploy</phase> <goals> <goal>exec</goal> </goals> </execution> </executions> 
+				<configuration> <executable>${argeo.p2.cmd}</executable> optional <workingDirectory>/tmp</workingDirectory> 
+				<arguments> <argument>-noSplash</argument> <argument>-application</argument> 
+				<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument> 
+				<argument>-metadataRepository</argument> <argument>file:${argeo.p2.repository}</argument> 
+				<argument>-artifactRepository</argument> <argument>file:${argeo.p2.repository}</argument> 
+				<argument>-bundles</argument> <argument>${project.build.directory}</argument> 
+				<argument>-features</argument> <argument>${project.build.directory}</argument> 
+				<argument>-compress</argument> <argument>-publishArtifacts</argument> </arguments> 
+				</configuration> </plugin> -->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> 
+				<executions> <execution> <id>p2-copyToRepo</id> <phase>deploy</phase> <goals> 
+				<goal>run</goal> </goals> <configuration> <tasks> <mkdir dir="${project.build.directory}/repobase" 
+				/> <copy todir="${project.build.directory}/repobase"> <fileset dir="${project.build.directory}/lib"> 
+				<include name="*.jar" /> </fileset> <fileset dir="${project.build.directory}/libsrc"> 
+				<include name="*.jar" /> </fileset> </copy> <exec executable="${argeo.p2.cmd}"> 
+				<arg value="-noSplash" /> <arg value="-application" /> <arg value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" 
+				/> <arg value="-metadataRepository" /> <arg value="file:${argeo.p2.repository}" 
+				/> <arg value="-artifactRepository" /> <arg value="file:${argeo.p2.repository}" 
+				/> <arg value="-bundles" /> <arg value="${project.build.directory}/repobase" 
+				/> <arg value="-features" /> <arg value="${project.build.directory}/repobase" 
+				/> <arg value="-compress" /> <arg value="-publishArtifacts" /> </exec> </tasks> 
+				</configuration> </execution> </executions> </plugin> -->
 		</plugins>
 	</build>
 	<dependencies>
@@ -212,6 +172,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
+						<version>2.1-alpha-1</version>
 						<extensions>true</extensions>
 						<configuration>
 							<version>${package.version}</version>
@@ -388,48 +349,18 @@
 							</execution>
 						</executions>
 					</plugin>
-<!-- 
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-copyToRepo</id>
-								<phase>deploy</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<mkdir dir="${distribution.root}/i386" />
-										<mkdir dir="${distribution.root}/x86_64" />
-										<delete verbose="true">
-											<fileset dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" />
-										</delete>
-										<copy todir="${distribution.root}/x86_64" verbose="true">
-											<fileset dir="target">
-												<include name="rpm/*/RPMS/*/*.rpm" />
-											</fileset>
-											<flattenmapper />
-										</copy>
-										<exec executable="/usr/bin/createrepo">
-											<arg value="${distribution.root}/x86_64" />
-										</exec>
-										<copy todir="${distribution.root}/i386" verbose="true">
-											<fileset dir="target">
-												<include name="rpm/*/RPMS/*/*.rpm" />
-											</fileset>
-											<flattenmapper />
-										</copy>
-										<exec executable="/usr/bin/createrepo">
-											<arg value="${distribution.root}/i386" />
-										</exec>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
- -->
+					<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> 
+						<executions> <execution> <id>rpm-copyToRepo</id> <phase>deploy</phase> <goals> 
+						<goal>run</goal> </goals> <configuration> <tasks> <mkdir dir="${distribution.root}/i386" 
+						/> <mkdir dir="${distribution.root}/x86_64" /> <delete verbose="true"> <fileset 
+						dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" /> </delete> 
+						<copy todir="${distribution.root}/x86_64" verbose="true"> <fileset dir="target"> 
+						<include name="rpm/*/RPMS/*/*.rpm" /> </fileset> <flattenmapper /> </copy> 
+						<exec executable="/usr/bin/createrepo"> <arg value="${distribution.root}/x86_64" 
+						/> </exec> <copy todir="${distribution.root}/i386" verbose="true"> <fileset 
+						dir="target"> <include name="rpm/*/RPMS/*/*.rpm" /> </fileset> <flattenmapper 
+						/> </copy> <exec executable="/usr/bin/createrepo"> <arg value="${distribution.root}/i386" 
+						/> </exec> </tasks> </configuration> </execution> </executions> </plugin> -->
 				</plugins>
 			</build>
 
diff --git a/pom.xml b/pom.xml
index 607a12dd0..d252fa50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,6 +292,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.3.1</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -300,6 +301,7 @@ limitations under the License.
 							<report>license</report>
 							<report>scm</report>
 							<report>issue-tracking</report>
+							<report>dependencies</report>
 						</reports>
 					</reportSet>
 					<reportSet>
@@ -313,6 +315,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
@@ -322,6 +325,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
@@ -329,6 +333,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.7.1</version>
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
@@ -337,6 +342,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
 					<tags>
@@ -349,6 +355,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
 				<inherited>false</inherited>
 			</plugin>
 			<plugin>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index a3f2285e8..ee07851b1 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -58,22 +58,6 @@
 					</filesets>
 				</configuration>
 			</plugin>
-<!-- 
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<compilerId>eclipse</compilerId>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-compiler-eclipse</artifactId>
-						<version>1.8.1</version>
-					</dependency>
-				</dependencies>
-			</plugin>
- -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -100,7 +84,7 @@
 					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
 						<_removeheaders>Bnd-LastModified</_removeheaders>
 					</instructions>
-- 
2.39.2