X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=a986fcee64063e159f8d8bd7fd81d4ae9dcc9b24;hb=45dcd17f9adcab2f2101f948466a1b70f39a81b6;hp=d252fa50a4ee8596bf46d19502c36d3caf94a44b;hpb=97fe9c6ced5eff0002c11faa7b69e0e4272f10c9;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index d252fa50a..a986fcee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>0.2.2-SNAPSHOT</version>
+		<version>0.3.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -12,22 +12,23 @@
 	<name>Argeo SLC</name>
 	<version>0.13.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle>0.13</developmentCycle>
+		<developmentCycle.slc>0.13</developmentCycle.slc>
 		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
+		<version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>modules</module>
-		<module>eclipse</module>
 		<module>server</module>
+		<module>eclipse</module>
 		<module>demo</module>
 		<module>dep</module>
-		<module>integration-tests</module>
-		<!-- <module>archetypes</module> -->
+		<!-- FIXME: integration tests are currently failing -->
+		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
-	<url>${site.urlBase}/${developmentCycle}</url>
+	<url>${site.urlBase}/${developmentCycle.slc}</url>
 	<scm>
 		<connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
 		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
@@ -91,6 +92,17 @@ limitations under the License.
 				<role>developer</role>
 			</roles>
 		</developer>
+		<developer>
+			<id>bsinou</id>
+			<name>Bruno Sinou</name>
+			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
+			<organization>Argeo</organization>
+			<organizationUrl>http://www.argeo.org</organizationUrl>
+			<roles>
+				<role>developer</role>
+				<role>QA</role>
+			</roles>
+		</developer>
 	</developers>
 	<contributors>
 		<contributor>
@@ -104,100 +116,221 @@ limitations under the License.
 			</roles>
 		</contributor>
 	</contributors>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.4</version>
+					<configuration>
+						<connectionType>connection</connectionType>
+					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.scm</groupId>
+							<artifactId>maven-scm-provider-gitexe</artifactId>
+							<version>1.2</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<version>${version.maven-argeo-osgi}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
+				<executions>
+					<execution>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+					<format>{0,date,yyyyMMdd_HHmmss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<revisionOnScmFailure>git</revisionOnScmFailure>
+					<providerImplementations>
+						<git>svn</git>
+					</providerImplementations>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.4.3</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<autoVersionSubmodules>true</autoVersionSubmodules>
+					<preparationGoals>clean install</preparationGoals>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	<!-- TO BE DELETED : done differently now to handle automatic generation 
+		of target platform. <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> 
+		<source>1.5</source> <target>1.5</target> </configuration> </plugin> <plugin> 
+		<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> 
+		<version>2.1.2</version> <executions> <execution> <id>attach-sources</id> 
+		<phase>package</phase> <goals> <goal>jar</goal> </goals> </execution> </executions> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> 
+		<version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-surefire-plugin</artifactId> <version>2.7.1</version> </plugin> 
+		<plugin> <groupId>org.argeo.maven.plugins</groupId> <artifactId>maven-argeo-osgi-plugin</artifactId> 
+		<version>${version.maven-argeo-osgi}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> 
+		<version>2.3.1</version> <configuration> <archive> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile> 
+		</archive> </configuration> </plugin> <plugin> <groupId>org.apache.felix</groupId> 
+		<artifactId>maven-bundle-plugin</artifactId> <version>${version.maven-bundle-plugin}</version> 
+		<extensions>true</extensions> <configuration> <manifestLocation>target/classes/META-INF</manifestLocation> 
+		<instructions> <Bundle-Version>${version.slc}-r${buildNumber}</Bundle-Version> 
+		<Bundle-SymbolicName>${project.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> </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
+		<artifactId>buildnumber-maven-plugin</artifactId> <version>1.0-beta-4</version> 
+		<executions> <execution> <phase>generate-resources</phase> <goals> <goal>create</goal> 
+		</goals> </execution> </executions> <configuration> <doCheck>false</doCheck> 
+		<doUpdate>false</doUpdate> <format>{0,date,yyyyMMdd_HHmmss}</format> <items> 
+		<item>timestamp</item> </items> <revisionOnScmFailure>git</revisionOnScmFailure> 
+		<providerImplementations> <git>svn</git> </providerImplementations> </configuration> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
+		<version>2.4.3</version> <configuration> <encoding>UTF-8</encoding> </configuration> 
+		</plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
+		<version>2.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+		<artifactId>maven-release-plugin</artifactId> <version>2.1</version> <configuration> 
+		<autoVersionSubmodules>true</autoVersionSubmodules> <releaseProfiles>release</releaseProfiles> 
+		<preparationGoals>clean install</preparationGoals> </configuration> </plugin> 
+		<plugin> <groupId>com.mycila.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> 
+		<version>1.8.0</version> <configuration> <header>license-apache2-header.txt</header> 
+		<failIfMissing>true</failIfMissing> <aggregate>true</aggregate> <includes> 
+		<include>src/**/*.java</include> <include>src/**/*.xml</include> </includes> 
+		<excludes> <exclude>**/springutil/**</exclude> <exclude>**/qooxdoo-sdk/**</exclude> 
+		</excludes> <useDefaultExcludes>true</useDefaultExcludes> <mapping> <java>SLASHSTAR_STYLE</java> 
+		<xml>XML_STYLE</xml> </mapping> </configuration> </plugin> </plugins> </build> -->
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<!-- SLC (itself) -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.specs</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.core</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.unit</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.launcher</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.lib.detached</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.simple</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.maven</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.hibernate</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.castor</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.activemq</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.jcr</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.server</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.osgi</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.jemmy</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>org.argeo.slc.ria</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.argeo.ria</groupId>
 				<artifactId>org.argeo.ria.core</artifactId>
@@ -206,19 +339,17 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>deploy</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 				<type>pom</type>
 			</dependency>
-
 			<!-- SLC dubious -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached.launcher</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 				<type>tar.gz</type>
 				<classifier>dist</classifier>
 			</dependency>
-
 			<!-- Argeo Commons -->
 			<dependency>
 				<groupId>org.argeo.commons.security</groupId>
@@ -247,9 +378,9 @@ limitations under the License.
 				<artifactId>org.argeo.server.jackrabbit</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -284,7 +415,7 @@ limitations under the License.
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
-			<url>file://${site.repoBase}/${developmentCycle}/</url>
+			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
 		</site>
 	</distributionManagement>
 	<reporting>
@@ -403,7 +534,7 @@ limitations under the License.
 				<site>
 					<id>argeo-slc-site</id>
 					<name>SLC Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
+					<url>file://${site.repoBase}/${version.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>