<?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.8-SNAPSHOT</version>
+ <version>1.1.10-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.argeo-commons>1.1</developmentCycle.argeo-commons>
<developmentCycle.argeo-commons.startDate>2012-06-19</developmentCycle.argeo-commons.startDate>
- <version.argeo-distribution>1.3.1</version.argeo-distribution>
- <version.argeo-commons>1.1.8</version.argeo-commons>
+ <version.argeo-distribution>1.4.0</version.argeo-distribution>
+ <version.argeo-commons>1.1.10-SNAPSHOT</version.argeo-commons>
<!-- RPM -->
<rpm.release>6</rpm.release>
- <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+ <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-1-staging/6/x86_64</rpm.stagingRepository>
<!-- encoding, see http://is.gd/mvn_source_encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<version>2.2</version>
</extension>
</extensions>
+ <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>
<pluginManagement>
<plugins>
<!-- Maven -->
</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>
<repositories>
<repository>
<id>argeo-tp</id>
- <url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.3.1</url>
+ <url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.4.x</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</repository>
<site>
<id>site</id>
- <name>Argeo Commons Site</name>
<url>dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
</site>
</distributionManagement>