<?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.9-SNAPSHOT</version>
+ <version>2.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.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-commons>2.1.8</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>1.4.0</version.argeo-distribution>
+ <version.rap>2.2.0-R-20131204-0942</version.rap>
+ <version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
<!-- RPM -->
<rpm.release>6</rpm.release>
- <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+ <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-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>img/**</include>
+ <include>theme/**</include>
+ <include>*.properties</include>
+ <include>properties/*.properties</include>
+ <include>p2.inf</include>
+ </includes>
+ <excludes>
+ <exclude>build.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
<pluginManagement>
<plugins>
<!-- Maven -->
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<!-- SLC specific instructions -->
<SLC-GroupId>${project.groupId}</SLC-GroupId>
+ <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
</instructions>
</configuration>
<executions>
</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>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Eclipse RAP -->
+ <dependency>
+ <groupId>org.argeo.tp.rap</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.argeo-distribution}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.addons</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap.addons}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<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/argeo-tp-1.4</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ </repository>
+ <repository>
+ <id>argeo-tp-rap</id>
+ <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
</repository>
+ <!-- <repository> <id>argeo-tp-rap</id> <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url>
+ <releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> <checksumPolicy>warn</checksumPolicy>
+ </releases> </repository> -->
</repositories>
<pluginRepositories>
<pluginRepository>
</pluginRepository>
<pluginRepository>
<id>argeo-maven-plugins</id>
- <url>http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x</url>
+ <url>http://repo.argeo.org/data/public/java/argeo-maven-1.1</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<distributionManagement>
<repository>
<id>staging</id>
- <url>dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+ <url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
<uniqueVersion>false</uniqueVersion>
</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>
+ <url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
</site>
</distributionManagement>
<profiles>
<repository>
<id>localrepo</id>
<name>Internal Release Repository</name>
- <url>dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+ <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
</repository>
<site>
<id>site</id>
<name>Argeo Commons Site</name>
- <url>dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+ <url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
</site>
</distributionManagement>
</profile>