X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b14b4282c56a95f231a2916128f3d8358d2e39fe;hb=76b53a8fdeb0e9180f6ca41517022e0c322bac86;hp=44c806c97e628c9f6bc365ba89713fbf74d23790;hpb=76afa8835422dec0fd7ad770ebb97faa30cb6825;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 44c806c97..b14b4282c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,9 @@
 <?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>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.6-SNAPSHOT</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>
@@ -12,7 +11,7 @@
 		<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.1</version.argeo-commons>
+		<version.argeo-commons>[1.1,1.2)</version.argeo-commons>
 		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -22,10 +21,8 @@
 		<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>
@@ -48,7 +45,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.
@@ -128,6 +125,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>
@@ -161,6 +168,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>
@@ -173,6 +184,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>
@@ -203,6 +216,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>
@@ -214,7 +228,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>
@@ -256,6 +270,8 @@ limitations under the License.
 									<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 -->
@@ -323,6 +339,26 @@ limitations under the License.
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<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>*.properties</include>
+					<include>p2.inf</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -341,6 +377,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>
@@ -357,7 +412,8 @@ limitations under the License.
 			<plugin>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
-					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+					<goals>deploy</goals>
+					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -398,31 +454,12 @@ 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>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>argeo-commons</id>
-			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.commons-1.1.1</url>
+			<url>http://repo.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>
@@ -432,35 +469,24 @@ limitations under the License.
 			<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>
 		</pluginRepository>
 		<pluginRepository>
-			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<id>argeo-maven-plugins</id>
+			<url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.maven.plugins-1.1.x</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>
 		</pluginRepository>
 	</pluginRepositories>
 	<distributionManagement>
 		<repository>
+			<id>staging</id>
+			<url>dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-commons-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
 		</repository>
 		<site>
 			<id>argeo-commons-site</id>
@@ -475,13 +501,12 @@ limitations under the License.
 				<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://localhost:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
+					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -489,8 +514,7 @@ limitations under the License.
 			<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>