X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=43b5b791e4782dd314af4a462d06e405b06d50e8;hb=92968002c331692951053325b76ef5e6a8e587f2;hp=baf0c909559e234e91b57298185c016f8dde4e87;hpb=bac0dd8d3f6c624dee998a40f1ada56daedd6ec8;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index baf0c9095..43b5b791e 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.5-SNAPSHOT</version>
+	<version>1.1.7-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,10 +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.5-SNAPSHOT</version.argeo-commons>
-		<!-- distribution -->
-		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
-		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+		<version.argeo-commons>1.1.6</version.argeo-commons>
 		<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 -->
@@ -46,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.
@@ -169,6 +165,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>
@@ -181,6 +181,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>
@@ -211,6 +213,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>
@@ -222,7 +225,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>
@@ -333,6 +336,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>
@@ -351,6 +374,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>
@@ -409,7 +451,7 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.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.3.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -428,8 +470,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>
@@ -440,13 +482,13 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/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-1.1.x</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 		<site>
-			<id>argeo-commons-site</id>
+			<id>site</id>
 			<name>Argeo Commons Site</name>
-			<url>file://${site.repoBase}/${project.version}</url>
+			<url>file:///srv/projects/www/commons/site/${project.version}</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -456,12 +498,12 @@ 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://localrepo:7070/data/files/java/org.argeo.commons-1.1.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>
+					<url>dav:http://localrepo:7070/data/files/java/org.argeo.commons-1.1.x</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -479,4 +521,4 @@ limitations under the License.
 			</modules>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>