X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=c6f488ccdb3803a5995023b56ce18e6cd7cc013d;hb=21d69ee3e31821e4ed1a6490afcf5b2bc37d271b;hp=020477876618498f409658982208bccf66be4604;hpb=93cbe9f892956ff12477be19965257fe55366bee;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 020477876..c6f488ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
-	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>0.3.4-SNAPSHOT</version>
+	<version>1.1.3</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.7</version.argeo-distribution>
-		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
-		<version.equinox>3.6.2</version.equinox>
-		<!-- maven -->
-		<version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+		<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>
 		<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 -->
+		<!-- encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<modules>
@@ -34,15 +26,19 @@
 		<module>server</module>
 		<module>eclipse</module>
 		<module>security</module>
-		<module>demo</module>
 	</modules>
+	<organization>
+		<name>Argeo</name>
+		<url>http://www.argeo.org</url>
+	</organization>
 	<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
+		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3
 		</developerConnection>
-		<url>https://svn.argeo.org/commons/trunk</url>
+		<url>https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</url>
 	</scm>
+	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -68,6 +64,10 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
+	<issueManagement>
+		<system>Bugzilla</system>
+		<url>https://bugzilla.argeo.org</url>
+	</issueManagement>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -93,13 +93,11 @@ limitations under the License.
 		</developer>
 	</developers>
 	<build>
-		<!-- NOTE: This is just a vision for the future, it's not yet implemented: 
-			see MNG-2216 <sourceEncoding>UTF-8</sourceEncoding> -->
 		<extensions>
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-webdav</artifactId>
-				<version>1.0-beta-2</version>
+				<artifactId>wagon-webdav-jackrabbit</artifactId>
+				<version>2.2</version>
 			</extension>
 		</extensions>
 		<pluginManagement>
@@ -109,8 +107,8 @@ limitations under the License.
 					<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>
@@ -132,11 +130,11 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.7.1</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>
@@ -149,28 +147,31 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.3</version>
+					<version>2.5</version>
 				</plugin>
 				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>2.1.1</version>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>2.4</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.1</version>
+					<version>2.2.2</version>
+					<configuration>
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+					</configuration>
 				</plugin>
 				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.2.0</version>
+					<version>2.3.7</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
 							<Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						</instructions>
 					</configuration>
 					<executions>
@@ -212,13 +213,114 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>${version.maven-argeo-osgi}</version>
+					<version>1.0.33</version>
 				</plugin>
 				<!-- Others -->
 				<plugin>
 					<groupId>com.mycila.maven-license-plugin</groupId>
 					<artifactId>maven-license-plugin</artifactId>
-					<version>1.8.0</version>
+					<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>
+										<!-- Java -->
+										<link>http://docs.oracle.com/javase/6/docs/api</link>
+										<!-- 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>
@@ -239,40 +341,25 @@ limitations under the License.
 					<doUpdate>false</doUpdate>
 					<timestampFormat>yyMMdd_HHmm</timestampFormat>
 				</configuration>
-				<!-- <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>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
+				<inherited>false</inherited>
 				<configuration>
-					<siteDirectory>doc/site</siteDirectory>
+					<skip>false</skip>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
-					<preparationGoals>clean install</preparationGoals>
+					<goals>deploy</goals>
+					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -302,8 +389,8 @@ limitations under the License.
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.argeo.dep</groupId>
-				<artifactId>versions-all</artifactId>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>binaries</artifactId>
 				<version>${version.argeo-distribution}</version>
 				<type>pom</type>
 				<scope>import</scope>
@@ -312,163 +399,75 @@ limitations under the License.
 	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<id>argeo-tp</id>
+			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
 	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</pluginRepository>
+		<pluginRepository>
+			<id>argeo</id>
+			<url>http://maven.argeo.org/argeo</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
 	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
 		<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>
-			<distributionManagement>
-				<site>
-					<id>argeo-commons-site</id>
-					<name>Argeo Commons Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
-				</site>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>localrepo</id>
 			<distributionManagement>
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-					</url>
+					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</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>
+					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>full</id>
-			<modules>
-				<module>doc</module>
-				<module>sandbox</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>el5</id>
 			<properties>
 				<rpm.release>5</rpm.release>
-				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
-				</rpm.stagingRepository>
+				<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