<?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.12-SNAPSHOT</version>
+ <version>2.1.42-SNAPSHOT</version>
<name>Argeo Commons</name>
<packaging>pom</packaging>
<properties>
- <version.argeo-commons>2.1.12-SNAPSHOT</version.argeo-commons>
+ <version.argeo-commons>2.1.41</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.5.0.argeo.20141029</version.rap.addons>
+ <version.argeo-distribution>2.1.15</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>
<module>org.argeo.util</module>
<module>org.argeo.osgi.boot</module>
<module>org.argeo.server.jcr</module>
- <!-- Eclipse -->
- <module>org.argeo.eclipse.ui</module>
- <module>org.argeo.eclipse.ui.rap</module>
- <module>org.argeo.eclipse.ui.rcp</module>
<!-- Security -->
<module>org.argeo.security.core</module>
<module>org.argeo.security.jackrabbit</module>
- <module>org.argeo.security.ldap</module>
- <module>org.argeo.security.mvc</module>
- <!-- Security Services -->
- <module>org.argeo.security.auth.ldap</module>
- <module>org.argeo.security.dao.ldap</module>
- <module>org.argeo.security.dao.cli</module>
- <module>org.argeo.security.dao.os</module>
- <module>org.argeo.security.dao.jackrabbit</module>
- <!-- Servers -->
- <module>org.argeo.server.jcr.mvc</module>
- <module>org.argeo.server.jackrabbit</module>
- <module>org.argeo.jackrabbit.webapp</module>
- <module>org.argeo.server.ads</module>
- <module>org.argeo.server.ads.server</module>
- <module>org.argeo.server.rap.webapp</module>
- <!-- Node -->
- <module>org.argeo.node.repo.jackrabbit</module>
+ <!-- Eclipse -->
+ <module>org.argeo.eclipse.ui</module>
+ <module>org.argeo.eclipse.ui.rap</module>
+ <!-- CMS -->
<module>org.argeo.cms</module>
- <!-- Standard Workbench Perspectives -->
- <module>org.argeo.osgi.ui.explorer</module>
- <module>org.argeo.jcr.ui.explorer</module>
- <module>org.argeo.security.equinox</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>
- <!-- Standard Workbench Products -->
<module>org.argeo.security.ui.rap</module>
- <module>org.argeo.security.ui.rcp</module>
- <!-- Legacy -->
- <module>org.argeo.server.core</module>
- <module>org.argeo.ext.jdbm</module>
- <!-- Dependencies and Distributions -->
+ <!-- Distribution -->
<module>dep</module>
<module>dist</module>
</modules>
<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>
+ <testSourceDirectory>ext/test</testSourceDirectory>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
<resource>
<directory>.</directory>
<exclude>.*</exclude>
<exclude>.*/**</exclude>
<exclude>src/**</exclude>
+ <exclude>ext/**</exclude>
<exclude>target/**</exclude>
<exclude>bin/**</exclude>
<exclude>pom.xml</exclude>
</excludes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>ext/test</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
<pluginManagement>
<plugins>
<!-- Maven -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</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/classes</generatedTestSourcesDirectory>
+ <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
</dependency>
</dependencies>
</plugin>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
+ <_include>bnd.bnd</_include>
<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.4</version>
+ <!-- <version>2.1-alpha-1</version> -->
<extensions>true</extensions>
<configuration>
<version>${project.version}</version>
+ <distribution>argeo${argeo.rpm.release}</distribution>
<group>Applications/System</group>
<prefix>/usr</prefix>
</configuration>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>maven-argeo-osgi-plugin</artifactId>
- <version>1.1.3</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>
<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>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.10.3</version>
<configuration>
+ <failOnError>false</failOnError>
<encoding>UTF-8</encoding>
<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
<detectLinks>true</detectLinks>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<excludes>
<exclude>**/demo/**/*</exclude>
</plugin>
</plugins>
</build>
- <!-- <dependencies> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp</groupId> -->
- <!-- <artifactId>binaries</artifactId> -->
- <!-- <type>pom</type> -->
- <!-- <version>${version.argeo-distribution}</version> -->
- <!-- <scope>compile</scope> -->
- <!-- </dependency> -->
- <!-- </dependencies> -->
+ <dependencies>
+ <dependency>
+ <groupId>org.argeo.tp</groupId>
+ <artifactId>argeo-tp</artifactId>
+ <version>${version.argeo-distribution}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.argeo.tp</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.argeo-distribution}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- Eclipse RAP -->
- <dependency>
- <groupId>org.argeo.tp.rap</groupId>
- <artifactId>binaries</artifactId>
+ <artifactId>argeo-tp</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/argeo-tp-1.4</url>
+ <id>argeo</id>
+ <url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
</repository>
+ <!-- Disable Maven default repository -->
<repository>
- <id>argeo-tp-rap</id>
- <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
<releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
+ <enabled>false</enabled>
</releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<pluginRepositories>
<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/files/java/argeo-${developmentCycle.argeo-commons}</url>
<uniqueVersion>false</uniqueVersion>
</repository>
- <site>
- <id>site</id>
- <url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
- </site>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>localrepo</id>
+ <repositories>
+ <repository>
+ <id>argeo</id>
+ <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>staging</id>
+ <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+ </repository>
+ <site>
+ <id>staging</id>
+ <url>dav:http://localhost:7070/data/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>
projects / lgpl / argeo-commons.git / blobdiff