X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=f610d63b2264d5987efe1d8322a0a4f7db125e6a;hb=a707002d2ac4cb3728876187b0d80445ab33acb5;hp=dcd8914d15deae71c3f407d55d9ea088c7aa8e95;hpb=de269c23051989f57d0fbc6a95c629f7e46631da;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index dcd8914d1..f610d63b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,21 +8,22 @@
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>0.3.4-SNAPSHOT</version>
+	<version>0.3.4</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>0.3</developmentCycle>
-		<version.argeo-distribution>1.1.6-SNAPSHOT</version.argeo-distribution>
-		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
-		<version.equinox>3.6.2</version.equinox>
-		<!-- Maven -->
-		<!-- Using version 2.3.4 causes package use conflict. To be investigated. -->
-		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
-		<version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+		<developmentCycle.startDate>2011-03-24</developmentCycle.startDate>
+		<version.argeo-distribution>1.1.7</version.argeo-distribution>
+		<version.argeo-commons>0.3.4</version.argeo-commons>
+		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+		<rpm.release>6</rpm.release>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-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>
@@ -32,23 +33,24 @@
 		<module>security</module>
 		<module>demo</module>
 		<module>doc</module>
-		<module>sandbox</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle}</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-0.3.4</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-0.3.4
+		</developerConnection>
+		<url>https://svn.argeo.org/commons/tags/argeo-commons-0.3.4</url>
 	</scm>
+	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 			<comments><![CDATA[
-SLC - Software LifeCycle framework
+Argeo Commons Enterprise Framework
 			   
-Copyright 2010 Mathieu Baudier
+Copyright 2011 Mathieu Baudier
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -78,21 +80,37 @@ limitations under the License.
 				<role>QA</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>
+			</roles>
+		</developer>
 	</developers>
 	<build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav-jackrabbit</artifactId>
+				<version>2.2</version>
+			</extension>
+		</extensions>
 		<pluginManagement>
 			<plugins>
+				<!-- Maven -->
 				<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>
+						<source>1.6</source>
+						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
 					<version>2.1.2</version>
 					<executions>
@@ -106,41 +124,49 @@ limitations under the License.
 					</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>
+					<version>2.12</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.3.1</version>
+					<version>2.4</version>
 					<configuration>
 						<archive>
 							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
+				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.2.2</version>
+					<configuration>
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+					</configuration>
+				</plugin>
+				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>${version.maven-bundle-plugin}</version>
+					<version>2.3.7</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
-							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+							<Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-							<_removeheaders>Bnd-LastModified</_removeheaders>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						</instructions>
 					</configuration>
 					<executions>
@@ -153,61 +179,184 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
+				<!-- Codehaus -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>buildnumber-maven-plugin</artifactId>
+					<version>1.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>rpm-maven-plugin</artifactId>
+					<version>2.1-alpha-1</version>
+					<extensions>true</extensions>
+					<configuration>
+						<version>${project.version}</version>
+						<release>r${timestamp}.el${rpm.release}</release>
+						<distribution>argeo${rpm.release}</distribution>
+						<packager>mbaudier@argeo.org</packager>
+						<group>Applications/System</group>
+						<prefix>/usr</prefix>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.2.1</version>
+				</plugin>
+				<!-- Argeo -->
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<version>1.0.33</version>
+				</plugin>
+				<!-- Others -->
+				<plugin>
+					<groupId>com.mycila.maven-license-plugin</groupId>
+					<artifactId>maven-license-plugin</artifactId>
+					<version>1.9.0</version>
+				</plugin>
+				<!-- Site -->
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.0</version>
+					<configuration>
+						<siteDirectory>doc/site</siteDirectory>
+						<generateSitemap>true</generateSitemap>
+						<skip>true</skip>
+						<reportPlugins>
+							<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-project-info-reports-plugin</artifactId>
+								<version>2.4</version>
+								<reportSets>
+									<reportSet>
+										<reports>
+											<report>index</report>
+											<report>summary</report>
+											<report>license</report>
+											<report>scm</report>
+											<report>issue-tracking</report>
+											<report>project-team</report>
+										</reports>
+									</reportSet>
+								</reportSets>
+							</plugin>
+							<plugin>
+								<artifactId>maven-javadoc-plugin</artifactId>
+								<version>2.8.1</version>
+								<configuration>
+									<encoding>UTF-8</encoding>
+									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
+									<detectLinks>true</detectLinks>
+									<links>
+										<!-- OSGi -->
+										<link>http://www.osgi.org/javadoc/r4v42</link>
+										<!-- Spring -->
+										<link>http://static.springsource.org/spring/docs/2.5.x/api</link>
+										<link>http://static.springsource.org/osgi/docs/1.2.x/api</link>
+										<link>http://static.springsource.org/spring-security/site/docs/2.0.x/apidocs</link>
+										<!-- JCR -->
+										<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+										<!-- Eclipse -->
+										<link>http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/reference/api</link>
+									</links>
+								</configuration>
+								<reportSets>
+									<reportSet>
+										<id>aggregate</id>
+										<reports>
+											<report>aggregate</report>
+										</reports>
+									</reportSet>
+								</reportSets>
+							</plugin>
+							<plugin>
+								<artifactId>maven-jxr-plugin</artifactId>
+								<version>2.3</version>
+								<configuration>
+									<excludes>
+										<exclude>**/demo/**/*</exclude>
+										<exclude>**/internal/**/*</exclude>
+									</excludes>
+								</configuration>
+								<reportSets>
+									<reportSet>
+										<id>aggregate</id>
+										<reports>
+											<report>aggregate</report>
+										</reports>
+									</reportSet>
+								</reportSets>
+							</plugin>
+							<plugin>
+								<groupId>org.codehaus.mojo</groupId>
+								<artifactId>taglist-maven-plugin</artifactId>
+								<version>2.4</version>
+								<configuration>
+									<aggregate>true</aggregate>
+									<tags>
+										<tag>TODO</tag>
+										<tag>FIXME</tag>
+									</tags>
+								</configuration>
+							</plugin>
+							<plugin>
+								<artifactId>maven-changelog-plugin</artifactId>
+								<version>2.2</version>
+								<configuration>
+									<type>date</type>
+									<dates>
+										<date>${developmentCycle.startDate}</date>
+									</dates>
+									<dateFormat>yyyy-MM-dd</dateFormat>
+								</configuration>
+							</plugin>
+						</reportPlugins>
+					</configuration>
+				</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>
+							<goal>create-timestamp</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>
+					<timestampFormat>yyMMdd_HHmm</timestampFormat>
 				</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>
+				<inherited>false</inherited>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</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>
+					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
 				</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>
@@ -260,113 +409,34 @@ limitations under the License.
 		<site>
 			<id>argeo-commons-site</id>
 			<name>Argeo Commons Site</name>
-			<url>file://${site.repoBase}/${developmentCycle}/</url>
+			<url>file://${site.repoBase}/${project.version}</url>
 		</site>
 	</distributionManagement>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.3.1</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>license</report>
-							<report>scm</report>
-							<report>issue-tracking</report>
-							<report>dependencies</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>project-team</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<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>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<aggregate>true</aggregate>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-						<tag>@deprecated</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<version>2.2</version>
-				<inherited>false</inherited>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.3</version>
-				<inherited>false</inherited>
-				<configuration>
-					<linkXref>true</linkXref>
-					<targetJdk>1.5</targetJdk>
-					<aggregate>true</aggregate>
-					<excludes>
-						<exclude>**/springutil/*.java</exclude>
-					</excludes>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>cpd</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<profiles>
 		<profile>
-			<id>release</id>
+			<id>localrepo</id>
 			<distributionManagement>
-				<site>
-					<id>argeo-commons-site</id>
-					<name>Argeo Commons Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
-				</site>
+				<repository>
+					<id>localrepo</id>
+					<name>Internal Release Repository</name>
+					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+					</url>
+				</repository>
+				<snapshotRepository>
+					<id>localrepo.snapshots</id>
+					<name>Internal Snapshot Repository</name>
+					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+					</url>
+				</snapshotRepository>
 			</distributionManagement>
 		</profile>
+		<profile>
+			<id>el5</id>
+			<properties>
+				<rpm.release>5</rpm.release>
+				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
+				</rpm.stagingRepository>
+			</properties>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file