X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=8e26fb261aaf73ef119885d563d6e1002b24975d;hb=379f22faac7044331f59c4f03115544f6567697f;hp=5103603c8eee3e4e3f00c2496674cc6bcdd5c6a3;hpb=335abf2b8731bdf9898e4fa0dcc3d3ab5b6c4c16;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 5103603c8..8e26fb261 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,20 @@
 <?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>2.1.15-SNAPSHOT</version>
+	<version>2.1.32-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.15-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.32-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.6</version.argeo-distribution>
+		<version.argeo-distribution>2.1.12</version.argeo-distribution>
 		<!-- RPM -->
-		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
+		<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>
 	</properties>
@@ -76,7 +77,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>
@@ -126,11 +127,13 @@ 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>
 						<!-- Hack to work around issues with generated annotations : -->
 						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
 						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
@@ -139,7 +142,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>
@@ -192,7 +195,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>
@@ -225,7 +228,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>
@@ -245,12 +248,12 @@ 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>
 					</configuration>
@@ -264,12 +267,12 @@ 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.5</version>
 				</plugin>
 				<!-- Site -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.0</version>
+					<version>3.4</version>
 					<configuration>
 						<siteDirectory>doc/site</siteDirectory>
 						<generateSitemap>true</generateSitemap>
@@ -278,7 +281,7 @@ limitations under the License.
 							<plugin>
 								<groupId>org.apache.maven.plugins</groupId>
 								<artifactId>maven-project-info-reports-plugin</artifactId>
-								<version>2.4</version>
+								<version>2.8.1</version>
 								<reportSets>
 									<reportSet>
 										<reports>
@@ -292,7 +295,7 @@ limitations under the License.
 							</plugin>
 							<plugin>
 								<artifactId>maven-javadoc-plugin</artifactId>
-								<version>2.8.1</version>
+								<version>2.10.3</version>
 								<configuration>
 									<encoding>UTF-8</encoding>
 									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
@@ -323,7 +326,7 @@ limitations under the License.
 							</plugin>
 							<plugin>
 								<artifactId>maven-jxr-plugin</artifactId>
-								<version>2.3</version>
+								<version>2.5</version>
 								<configuration>
 									<excludes>
 										<exclude>**/demo/**/*</exclude>
@@ -398,10 +401,21 @@ limitations under the License.
 			<scope>provided</scope>
 		</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>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+			<url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -441,8 +455,8 @@ limitations under the License.
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -453,10 +467,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:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</repository>
+				<site>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${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>