X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=23d40a5386b8a40443bdbaa4197ec14b10f36997;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-commons-2.1.5;hp=1081e402061f52aa70d547304fb2ff0158a4e63d;hpb=d4965ca4ec8fc5489bd947a36b3435a9ffec74d0;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 1081e4020..23d40a538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,40 +3,35 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>1.1.4-SNAPSHOT</version>
+	<version>2.1.5</version>
 	<name>Argeo Commons</name>
 	<description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>1.1</developmentCycle>
-		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
-		<version.argeo-distribution>1.3.1</version.argeo-distribution>
-		<version.argeo-commons>1.1.3</version.argeo-commons>
-		<!-- distribution -->
-		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
-		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+		<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
+		<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
+		<version.argeo-distribution>1.4.0</version.argeo-distribution>
+		<version.argeo-commons>2.1.5</version.argeo-commons>
+		<!-- RPM -->
 		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
 		<!-- encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<modules>
-		<module>basic</module>
-		<module>osgi</module>
+		<module>base</module>
 		<module>server</module>
-		<module>eclipse</module>
 		<module>security</module>
 	</modules>
 	<organization>
 		<name>Argeo</name>
 		<url>http://www.argeo.org</url>
 	</organization>
-	<url>${site.urlBase}/${developmentCycle}</url>
+	<url>http://projects.argeo.org/commons/</url>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
-		</developerConnection>
-		<url>https://svn.argeo.org/commons/trunk</url>
+		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.5</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.5</developerConnection>
+		<url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.5</url>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -47,7 +42,7 @@
 			<comments><![CDATA[
 Argeo Commons Enterprise Framework
 			   
-Copyright 2011 Mathieu Baudier
+Copyright (C) 2007-2012 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -100,6 +95,29 @@ limitations under the License.
 				<version>2.2</version>
 			</extension>
 		</extensions>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>plugin.xml</include>
+					<include>META-INF/**</include>
+					<include>WEB-INF/**</include>
+					<include>icons/**</include>
+					<include>branding/**</include>
+					<include>img/**</include>
+					<include>theme/**</include>
+					<include>*.properties</include>
+					<include>properties/*.properties</include>
+					<include>p2.inf</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<pluginManagement>
 			<plugins>
 				<!-- Maven -->
@@ -127,6 +145,16 @@ limitations under the License.
 				<plugin>
 					<artifactId>maven-clean-plugin</artifactId>
 					<version>2.4.1</version>
+					<configuration>
+						<filesets>
+							<fileset>
+								<directory>META-INF</directory>
+								<includes>
+									<include>MANIFEST.MF</include>
+								</includes>
+							</fileset>
+						</filesets>
+					</configuration>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -160,6 +188,10 @@ limitations under the License.
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 					</configuration>
 				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.8.1</version>
+				</plugin>
 				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
@@ -172,6 +204,8 @@ limitations under the License.
 							<Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+							<!-- SLC specific instructions -->
+							<SLC-GroupId>${project.groupId}</SLC-GroupId>
 						</instructions>
 					</configuration>
 					<executions>
@@ -202,6 +236,7 @@ limitations under the License.
 						<packager>mbaudier@argeo.org</packager>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
+						<copyright>2012 Argeo GmbH and others</copyright>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -213,7 +248,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.0.33</version>
+					<version>1.1.2</version>
 				</plugin>
 				<!-- Others -->
 				<plugin>
@@ -221,6 +256,11 @@ limitations under the License.
 					<artifactId>maven-license-plugin</artifactId>
 					<version>1.9.0</version>
 				</plugin>
+				<plugin>
+					<groupId>com.agilejava.docbkx</groupId>
+					<artifactId>docbkx-maven-plugin</artifactId>
+					<version>2.0.14</version>
+				</plugin>
 				<!-- Site -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
@@ -314,7 +354,7 @@ limitations under the License.
 								<configuration>
 									<type>date</type>
 									<dates>
-										<date>${developmentCycle.startDate}</date>
+										<date>${developmentCycle.argeo-commons.startDate}</date>
 									</dates>
 									<dateFormat>yyyy-MM-dd</dateFormat>
 								</configuration>
@@ -342,6 +382,25 @@ limitations under the License.
 					<timestampFormat>yyMMdd_HHmm</timestampFormat>
 				</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>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
@@ -359,7 +418,7 @@ limitations under the License.
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
 					<goals>deploy</goals>
-					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -384,6 +443,34 @@ limitations under the License.
 					</mapping>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.agilejava.docbkx</groupId>
+				<artifactId>docbkx-maven-plugin</artifactId>
+				<configuration>
+					<sourceDirectory>doc/reference</sourceDirectory>
+					<targetDirectory>target/site/reference</targetDirectory>
+					<htmlStylesheet>css/style.css</htmlStylesheet>
+					<postProcess>
+						<copy todir="target/site/reference">
+							<fileset dir="doc/reference">
+								<include name="*/*.css" />
+							</fileset>
+							<fileset dir="doc/reference">
+								<include name="img/**" />
+							</fileset>
+						</copy>
+					</postProcess>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>generate-html</goal>
+							<goal>generate-pdf</goal>
+						</goals>
+						<phase>pre-site</phase>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -400,7 +487,16 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.4.x</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>argeo-tp-rap</id>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.tp.rap-2.1.x</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -419,8 +515,8 @@ limitations under the License.
 			</releases>
 		</pluginRepository>
 		<pluginRepository>
-			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<id>argeo-maven-plugins</id>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -431,13 +527,12 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
+			<url>dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 		<site>
-			<id>argeo-commons-site</id>
-			<name>Argeo Commons Site</name>
-			<url>file://${site.repoBase}/${project.version}</url>
+			<id>site</id>
+			<url>dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -447,13 +542,13 @@ limitations under the License.
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
+					<url>dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
 				</repository>
-				<snapshotRepository>
-					<id>localrepo.snapshots</id>
-					<name>Internal Snapshot Repository</name>
-					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
-				</snapshotRepository>
+				<site>
+					<id>site</id>
+					<name>Argeo Commons Site</name>
+					<url>dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+				</site>
 			</distributionManagement>
 		</profile>
 		<profile>
@@ -463,11 +558,5 @@ limitations under the License.
 				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository>
 			</properties>
 		</profile>
-		<profile>
-			<id>doc</id>
-			<modules>
-				<module>doc</module>
-			</modules>
-		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>