X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=eb328aa265d1f4bc9ee8e4cb289bcfc3af9fa214;hb=908a554bf2e7c897c3433cb45b443c994bee3b1c;hp=59695645324e946f609474bc095a446755ea1d19;hpb=f9d426f73788704eb7887e146402973bd0be5019;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 596956453..00656049b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,47 +4,50 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.29-SNAPSHOT</version>
+	<version>2.1.69-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.29</version.argeo-commons>
+		<version.argeo-commons>2.1.69-SNAPSHOT</version.argeo-commons>
 		<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
 		<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-		<version.argeo-distribution>2.1.11</version.argeo-distribution>
+		<version.argeo-distribution>2.1.17</version.argeo-distribution>
 		<!-- RPM -->
-		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
-		<!-- encoding, see http://is.gd/mvn_source_encoding -->
+		<argeo.rpm.release>7</argeo.rpm.release>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+		<!-- Encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
 		<module>org.argeo.util</module>
+		<module>org.argeo.enterprise</module>
+		<module>org.argeo.jcr</module>
 		<module>org.argeo.osgi.boot</module>
-		<module>org.argeo.server.jcr</module>
-		<!-- Security -->
-		<module>org.argeo.security.core</module>
-		<module>org.argeo.security.jackrabbit</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
+		<module>org.argeo.node.api</module>
 		<module>org.argeo.cms</module>
-		<!-- Workbench -->
-		<module>org.argeo.eclipse.ui.workbench</module>
-		<module>org.argeo.eclipse.ui.workbench.rap</module>
-		<module>org.argeo.security.ui</module>
-		<module>org.argeo.security.ui.admin</module>
-		<module>org.argeo.security.ui.rap</module>
+		<module>org.argeo.cms.ui</module>
+		<!-- CMS Workbench -->
+		<module>org.argeo.cms.ui.workbench</module>
+		<module>org.argeo.cms.ui.workbench.rap</module>
+		<!-- Third Parties Extensions -->
+		<module>org.argeo.ext.jackrabbit</module>
+		<module>org.argeo.ext.rap.ui.workbench</module>
 		<!-- Distribution -->
 		<module>dep</module>
+		<module>doc</module>
 		<module>dist</module>
 	</modules>
 	<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:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
+		<url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
+		<tag>HEAD</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -55,7 +58,7 @@
 			<comments><![CDATA[
 Argeo Commons Enterprise Framework
 			   
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2016 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.
@@ -77,7 +80,7 @@ limitations under the License.
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.8</version>
+				<version>2.10</version>
 			</extension>
 		</extensions>
 		<sourceDirectory>src</sourceDirectory>
@@ -127,10 +130,10 @@ limitations under the License.
 				<!-- Maven -->
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
+					<version>3.3</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>1.8</source>
+						<target>1.8</target>
 						<compilerId>eclipse</compilerId>
 						<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
 						<optimize>true</optimize>
@@ -142,7 +145,7 @@ limitations under the License.
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.3</version>
+							<version>2.6</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -195,7 +198,7 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.7</version>
+					<version>1.8</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
@@ -212,15 +215,15 @@ limitations under the License.
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 					</configuration>
 				</plugin>
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.1</version>
-				</plugin>
+				<!-- <plugin> -->
+				<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+				<!-- <version>2.10.4</version> -->
+				<!-- </plugin> -->
 				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.3.7</version>
+					<version>3.0.1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
@@ -228,7 +231,7 @@ limitations under the License.
 							<_include>bnd.bnd</_include>
 							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<!-- SLC specific instructions -->
 							<SLC-Category>${project.groupId}</SLC-Category>
@@ -248,14 +251,17 @@ limitations under the License.
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1-alpha-1</version>
+					<version>2.1.4</version>
+					<!-- <version>2.1-alpha-1</version> -->
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
-						<release>1.el${rpm.release}</release>
-						<distribution>argeo${rpm.release}</distribution>
+						<distribution>argeo${argeo.rpm.release}</distribution>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
+						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
+						<defaultDirMode>755</defaultDirMode>
+						<defaultFileMode>644</defaultFileMode>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -267,52 +273,52 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.4</version>
+					<version>1.1.6</version>
 				</plugin>
 				<!-- Site -->
+
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.0</version>
+					<version>3.6</version>
 					<configuration>
-						<siteDirectory>doc/site</siteDirectory>
-						<generateSitemap>true</generateSitemap>
-						<skip>true</skip>
+						<!-- <siteDirectory>doc/site</siteDirectory> -->
+						<!-- <generateSitemap>true</generateSitemap> -->
+						<!-- <skip>false</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>
-										</reports>
-									</reportSet>
-								</reportSets>
-							</plugin>
+							<!-- <plugin> -->
+							<!-- <groupId>org.apache.maven.plugins</groupId> -->
+							<!-- <artifactId>maven-project-info-reports-plugin</artifactId> -->
+							<!-- <version>2.8.1</version> -->
+							<!-- <reportSets> -->
+							<!-- <reportSet> -->
+							<!-- <reports> -->
+							<!-- <report>index</report> -->
+							<!-- <report>summary</report> -->
+							<!-- <report>license</report> -->
+							<!-- <report>scm</report> -->
+							<!-- </reports> -->
+							<!-- </reportSet> -->
+							<!-- </reportSets> -->
+							<!-- </plugin> -->
 							<plugin>
 								<artifactId>maven-javadoc-plugin</artifactId>
-								<version>2.8.1</version>
+								<version>2.10.4</version>
 								<configuration>
 									<encoding>UTF-8</encoding>
-									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
 									<detectLinks>true</detectLinks>
+									<sourcepath>src</sourcepath>
 									<links>
 										<!-- Java -->
-										<link>http://docs.oracle.com/javase/6/docs/api</link>
+										<link>http://docs.oracle.com/javase/8/docs/api</link>
 										<!-- OSGi -->
-										<link>http://www.osgi.org/javadoc/r4v42</link>
+										<link>http://www.osgi.org/javadoc/r5/core</link>
+										<link>http://www.osgi.org/javadoc/r5/enterprise</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>
+										<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</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>
+										<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
 									</links>
 								</configuration>
 								<reportSets>
@@ -326,13 +332,7 @@ limitations under the License.
 							</plugin>
 							<plugin>
 								<artifactId>maven-jxr-plugin</artifactId>
-								<version>2.3</version>
-								<configuration>
-									<excludes>
-										<exclude>**/demo/**/*</exclude>
-										<exclude>**/internal/**/*</exclude>
-									</excludes>
-								</configuration>
+								<version>2.5</version>
 								<reportSets>
 									<reportSet>
 										<id>aggregate</id>
@@ -361,12 +361,12 @@ limitations under the License.
 					</filesets>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
+			<!-- <plugin> -->
+			<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+			<!-- <configuration> -->
+			<!-- <skip>true</skip> -->
+			<!-- </configuration> -->
+			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
@@ -376,9 +376,9 @@ limitations under the License.
 			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<inherited>false</inherited>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
+<!-- 				<configuration> -->
+<!-- 					<skip>true</skip> -->
+<!-- 				</configuration> -->
 			</plugin>
 			<plugin>
 				<artifactId>maven-release-plugin</artifactId>
@@ -399,48 +399,40 @@ limitations under the License.
 			<artifactId>argeo-tp</artifactId>
 			<version>${version.argeo-distribution}</version>
 			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.tp.spring</groupId>
-					<artifactId>org.springframework.ldap</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.acls</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.aspects</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.config</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.ldap</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.spring.security</groupId>
-					<artifactId>org.springframework.security.web</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>argeo-tp</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<!-- Disable Maven default repository -->
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -465,17 +457,21 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
+		<site>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
+		</site>
 	</distributionManagement>
 	<profiles>
 		<profile>
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<id>argeo</id>
+					<url>http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -486,10 +482,69 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<name>Internal Release Repository</name>
-					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
 				</repository>
+				<site>
+					<id>staging</id>
+					<url>dav:http://localhost:7080/files/docs/argeo-${developmentCycle.argeo-commons}</url>
+				</site>
 			</distributionManagement>
 		</profile>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>