<modelVersion>4.0.0</modelVersion>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.1.48-SNAPSHOT</version>
+ <version>2.1.74-SNAPSHOT</version>
<name>Argeo Commons</name>
<packaging>pom</packaging>
<properties>
- <version.argeo-commons>2.1.48</version.argeo-commons>
+ <version.argeo-commons>2.1.73</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.16</version.argeo-distribution>
+ <version.argeo-tp>2.1.20</version.argeo-tp>
<!-- RPM -->
<argeo.rpm.release>7</argeo.rpm.release>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</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>
<module>org.argeo.eclipse.ui.rap</module>
<!-- CMS -->
<module>org.argeo.node.api</module>
+ <module>org.argeo.maintenance</module>
<module>org.argeo.cms</module>
+ <module>org.argeo.cms.ui.theme</module>
<module>org.argeo.cms.ui</module>
+ <!-- CMS E4 -->
+ <module>org.argeo.cms.e4</module>
+ <module>org.argeo.cms.e4.rap</module>
<!-- CMS Workbench -->
<module>org.argeo.cms.ui.workbench</module>
<module>org.argeo.cms.ui.workbench.rap</module>
<module>org.argeo.ext.rap.ui.workbench</module>
<!-- Distribution -->
<module>dep</module>
+ <module>demo</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>
<exclude>build.properties</exclude>
<exclude>*.bnd</exclude>
<exclude>*.target</exclude>
+ <exclude>**/*.xcf</exclude>
</excludes>
</resource>
</resources>
<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>
</plugin>
<!-- Site -->
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.0</version>
<configuration>
- <siteDirectory>doc/site</siteDirectory>
- <generateSitemap>true</generateSitemap>
- <skip>true</skip>
- <reportPlugins>
- <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.10.3</version>
- <configuration>
- <failOnError>false</failOnError>
- <encoding>UTF-8</encoding>
- <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 -->
- <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>
- <!-- 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>
- </links>
- </configuration>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <excludes>
- <exclude>**/demo/**/*</exclude>
- <exclude>**/internal/**/*</exclude>
- </excludes>
- </configuration>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </reportPlugins>
+ <encoding>UTF-8</encoding>
+ <detectLinks>true</detectLinks>
+ <!-- <sourcepath>src</sourcepath> -->
+ <links>
+ <!-- Java -->
+ <link>http://docs.oracle.com/javase/8/docs/api</link>
+ <!-- OSGi -->
+ <link>http://www.osgi.org/javadoc/r5/core</link>
+ <link>http://www.osgi.org/javadoc/r5/enterprise</link>
+ <!-- Spring -->
+ <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/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+ </links>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7</version>
+ <!-- <configuration> -->
+ <!-- <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.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>3.0.0</version> -->
+ <!-- <configuration> -->
+ <!-- <encoding>UTF-8</encoding> -->
+ <!-- <detectLinks>true</detectLinks> -->
+ <!-- <sourcepath>src</sourcepath> -->
+ <!-- <links> -->
+ <!-- Java -->
+ <!-- <link>http://docs.oracle.com/javase/8/docs/api</link> -->
+ <!-- OSGi -->
+ <!-- <link>http://www.osgi.org/javadoc/r5/core</link> -->
+ <!-- <link>http://www.osgi.org/javadoc/r5/enterprise</link> -->
+ <!-- Spring -->
+ <!-- <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/neon/topic/org.eclipse.platform.doc.isv/reference/api</link> -->
+ <!-- </links> -->
+ <!-- </configuration> -->
+ <!-- <reportSets> -->
+ <!-- <reportSet> -->
+ <!-- <id>aggregate</id> -->
+ <!-- <reports> -->
+ <!-- <report>aggregate</report> -->
+ <!-- </reports> -->
+ <!-- </reportSet> -->
+ <!-- </reportSets> -->
+ <!-- </plugin> -->
+ <!-- <plugin> -->
+ <!-- <artifactId>maven-jxr-plugin</artifactId> -->
+ <!-- <version>2.5</version> -->
+ <!-- <reportSets> -->
+ <!-- <reportSet> -->
+ <!-- <id>aggregate</id> -->
+ <!-- <reports> -->
+ <!-- <report>aggregate</report> -->
+ <!-- </reports> -->
+ <!-- </reportSet> -->
+ <!-- </reportSets> -->
+ <!-- </plugin> -->
+ <!-- </reportPlugins> -->
+ <!-- </configuration> -->
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
</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>
<dependency>
<groupId>org.argeo.tp</groupId>
<artifactId>argeo-tp</artifactId>
- <version>${version.argeo-distribution}</version>
+ <version>${version.argeo-tp}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.argeo.tp</groupId>
<artifactId>argeo-tp</artifactId>
- <version>${version.argeo-distribution}</version>
+ <version>${version.argeo-tp}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp</groupId>
+ <artifactId>argeo-tp-rap-e4</artifactId>
+ <version>${version.argeo-tp}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<repositories>
<repository>
<id>argeo</id>
- <url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
+ <url>http://forge.argeo.org/data/java/argeo-2.1/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<distributionManagement>
<repository>
<id>staging</id>
- <url>dav:https://forge.argeo.org/data/files/java/argeo-${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>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</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>3.0.0</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <detectLinks>true</detectLinks>
+ <!-- <sourcepath>src</sourcepath> -->
+ <links>
+ <!-- Java -->
+ <link>http://docs.oracle.com/javase/8/docs/api</link>
+ <!-- OSGi -->
+ <link>http://www.osgi.org/javadoc/r5/core</link>
+ <link>http://www.osgi.org/javadoc/r5/enterprise</link>
+ <!-- Spring -->
+ <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/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>aggregate-javadoc</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>javadoc</id>
+ <reports>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate-jxr</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>jxr</id>
+ <reports>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<profiles>
<profile>
<id>localrepo</id>
<repositories>
<repository>
<id>argeo</id>
- <url>http://localhost:7080/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
+ <url>http://localhost:7080/data/java/argeo-2.1</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<distributionManagement>
<repository>
<id>staging</id>
- <url>dav:http://localhost:7080/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+ <url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+ <uniqueVersion>false</uniqueVersion>
</repository>
<site>
<id>staging</id>
- <url>dav:http://localhost:7080/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
+ <url>dav:http://localhost:7080/data/docs/argeo-${developmentCycle.argeo-commons}</url>
</site>
</distributionManagement>
</profile>