X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=7a93692a764b448acd5478f2e4c04e9133ffc4e6;hb=23b273e95c070b0c5bcf501290d7c7754f339cdf;hp=13a5d9a80a7676196e71833f5e72693e8f56a277;hpb=cfc29b848ce16de86f1420c1cb837950210f3913;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 13a5d9a80..7a93692a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,38 +1,31 @@
 <?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.5-SNAPSHOT</version>
+	<version>1.1.8-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>
 	<properties>
-		<developmentCycle>0.3</developmentCycle>
-		<developmentCycle.startDate>2011-03-24</developmentCycle.startDate>
-		<version.argeo-distribution>1.2.0</version.argeo-distribution>
-		<version.argeo-commons>0.3.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>
+		<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.7</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 -->
 		<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>
 	<scm>
 		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
@@ -49,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.
@@ -66,6 +59,10 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
+	<issueManagement>
+		<system>Bugzilla</system>
+		<url>https://bugzilla.argeo.org</url>
+	</issueManagement>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -125,6 +122,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>
@@ -158,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>
@@ -170,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>
@@ -200,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>
@@ -211,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>
@@ -253,6 +267,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 -->
@@ -320,6 +336,27 @@ 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>properties/*.properties</include>
+					<include>p2.inf</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -338,6 +375,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>
@@ -354,7 +410,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>
@@ -384,8 +441,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>
@@ -394,25 +451,45 @@ limitations under the License.
 	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<id>argeo-tp</id>
+			<url>http://repo.argeo.org/data/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-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>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
 	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<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>
@@ -422,14 +499,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/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:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-					</url>
+					<url>dav:http://localrepo:7070/data/files/java/org.argeo.commons-1.1.x</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -437,8 +512,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>
@@ -448,4 +522,4 @@ limitations under the License.
 			</modules>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>