X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=33c70f142686ee658f55461de26286be5978e43b;hb=535985419fc3f71a0538d2fbcb100d542f7061da;hp=f2c914d3db960d4b59c23b7e1bcc7bfaf415dac8;hpb=1c64aee10396286c45d21e07a31f9691c1a6d02b;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index f2c914d3d..33c70f142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,16 @@
 <?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.13-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.13-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>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.5</version.argeo-distribution>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
 		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -25,44 +22,31 @@
 		<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.jcr</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 -->
+		<!-- Server -->
+		<module>org.argeo.server.core</module>
 		<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 -->
+		<!-- Eclipse -->
+		<module>org.argeo.eclipse.ui</module>
+		<module>org.argeo.eclipse.ui.rap</module>
+		<!-- Argeo Node -->
 		<module>org.argeo.node.repo.jackrabbit</module>
-		<!-- Standard Workbench Perspectives -->
-		<module>org.argeo.osgi.ui.explorer</module>
-		<module>org.argeo.jcr.ui.explorer</module>
+		<module>org.argeo.cms</module>
+		<!-- Workbench -->
+		<module>org.argeo.eclipse.ui.workbench</module>
 		<module>org.argeo.security.equinox</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.support.junit</module>
-		<module>org.argeo.server.core</module>
-		<module>org.argeo.ext.jdbm</module>
 		<!-- Dependencies and Distributions -->
 		<module>dep</module>
 		<module>dist</module>
@@ -106,9 +90,17 @@ limitations under the License.
 				<version>2.8</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>
@@ -119,6 +111,7 @@ limitations under the License.
 					<exclude>.*</exclude>
 					<exclude>.*/**</exclude>
 					<exclude>src/**</exclude>
+					<exclude>ext/**</exclude>
 					<exclude>target/**</exclude>
 					<exclude>bin/**</exclude>
 					<exclude>pom.xml</exclude>
@@ -128,6 +121,17 @@ limitations under the License.
 				</excludes>
 			</resource>
 		</resources>
+		<testResources>
+			<testResource>
+				<directory>ext/test</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
 		<pluginManagement>
 			<plugins>
 				<!-- Maven -->
@@ -135,9 +139,20 @@ limitations under the License.
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.2</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
+						<compilerId>eclipse</compilerId>
+						<!-- Hack to work around issues with generated annotations : -->
+						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-compiler-eclipse</artifactId>
+							<version>2.3</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
@@ -218,12 +233,13 @@ limitations under the License.
 					<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.7</Bundle-RequiredExecutionEnvironment>
+							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<!-- SLC specific instructions -->
 							<SLC-Category>${project.groupId}</SLC-Category>
-							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 						</instructions>
 					</configuration>
 					<executions>
@@ -237,24 +253,17 @@ limitations under the License.
 					</executions>
 				</plugin>
 				<!-- Codehaus -->
-				<!-- <plugin> -->
-				<!-- <groupId>org.codehaus.mojo</groupId> -->
-				<!-- <artifactId>buildnumber-maven-plugin</artifactId> -->
-				<!-- <version>1.0</version> -->
-				<!-- </plugin> -->
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1</version>
+					<version>2.1-alpha-1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
-						<release>r${timestamp}.el${rpm.release}</release>
+						<release>1.el${rpm.release}</release>
 						<distribution>argeo${rpm.release}</distribution>
-						<packager>mbaudier@argeo.org</packager>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
-						<copyright>2012 Argeo GmbH and others</copyright>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -266,19 +275,8 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.3-SNAPSHOT</version>
+					<version>1.1.3</version>
 				</plugin>
-				<!-- Others -->
-				<!-- <plugin> -->
-				<!-- <groupId>com.mycila.maven-license-plugin</groupId> -->
-				<!-- <artifactId>maven-license-plugin</artifactId> -->
-				<!-- <version>1.9.0</version> -->
-				<!-- </plugin> -->
-				<!-- <plugin> -->
-				<!-- <groupId>com.agilejava.docbkx</groupId> -->
-				<!-- <artifactId>docbkx-maven-plugin</artifactId> -->
-				<!-- <version>2.0.14</version> -->
-				<!-- </plugin> -->
 				<!-- Site -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
@@ -352,52 +350,12 @@ limitations under the License.
 									</reportSet>
 								</reportSets>
 							</plugin>
-							<!-- <plugin> -->
-							<!-- <groupId>org.codehaus.mojo</groupId> -->
-							<!-- <artifactId>taglist-maven-plugin</artifactId> -->
-							<!-- <version>2.4</version> -->
-							<!-- <configuration> -->
-							<!-- <aggregate>true</aggregate> -->
-							<!-- <tags> -->
-							<!-- <tag>TODO</tag> -->
-							<!-- <tag>FIXME</tag> -->
-							<!-- </tags> -->
-							<!-- </configuration> -->
-							<!-- </plugin> -->
-							<!-- <plugin> -->
-							<!-- <artifactId>maven-changelog-plugin</artifactId> -->
-							<!-- <version>2.2</version> -->
-							<!-- <configuration> -->
-							<!-- <type>date</type> -->
-							<!-- <dates> -->
-							<!-- <date>${developmentCycle.argeo-commons.startDate}</date> -->
-							<!-- </dates> -->
-							<!-- <dateFormat>yyyy-MM-dd</dateFormat> -->
-							<!-- </configuration> -->
-							<!-- </plugin> -->
 						</reportPlugins>
 					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<!-- <plugin> -->
-			<!-- <groupId>org.codehaus.mojo</groupId> -->
-			<!-- <artifactId>buildnumber-maven-plugin</artifactId> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <phase>generate-resources</phase> -->
-			<!-- <goals> -->
-			<!-- <goal>create-timestamp</goal> -->
-			<!-- </goals> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- <configuration> -->
-			<!-- <doCheck>false</doCheck> -->
-			<!-- <doUpdate>false</doUpdate> -->
-			<!-- <timestampFormat>yyMMdd_HHmm</timestampFormat> -->
-			<!-- </configuration> -->
-			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
 				<configuration>
@@ -437,113 +395,30 @@ limitations under the License.
 					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
 				</configuration>
 			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>com.mycila.maven-license-plugin</groupId> -->
-			<!-- <artifactId>maven-license-plugin</artifactId> -->
-			<!-- <configuration> -->
-			<!-- <header>license-apache2-header.txt</header> -->
-			<!-- <failIfMissing>true</failIfMissing> -->
-			<!-- <aggregate>true</aggregate> -->
-			<!-- <includes> -->
-			<!-- <include>src/**/*.java</include> -->
-			<!-- <include>src/**/*.xml</include> -->
-			<!-- </includes> -->
-			<!-- <excludes> -->
-			<!-- <exclude>**/springutil/**</exclude> -->
-			<!-- <exclude>**/qooxdoo-sdk/**</exclude> -->
-			<!-- </excludes> -->
-			<!-- <useDefaultExcludes>true</useDefaultExcludes> -->
-			<!-- <mapping> -->
-			<!-- <java>SLASHSTAR_STYLE</java> -->
-			<!-- <xml>XML_STYLE</xml> -->
-			<!-- </mapping> -->
-			<!-- </configuration> -->
-			<!-- </plugin> -->
-			<!-- <plugin> -->
-			<!-- <groupId>com.agilejava.docbkx</groupId> -->
-			<!-- <artifactId>docbkx-maven-plugin</artifactId> -->
-			<!-- <configuration> -->
-			<!-- <sourceDirectory>doc/reference</sourceDirectory> -->
-			<!-- <targetDirectory>target/site/reference</targetDirectory> -->
-			<!-- <htmlStylesheet>css/style.css</htmlStylesheet> -->
-			<!-- <postProcess> -->
-			<!-- <copy todir="target/site/reference"> -->
-			<!-- <fileset dir="doc/reference"> -->
-			<!-- <include name="*/*.css" /> -->
-			<!-- </fileset> -->
-			<!-- <fileset dir="doc/reference"> -->
-			<!-- <include name="img/**" /> -->
-			<!-- </fileset> -->
-			<!-- </copy> -->
-			<!-- </postProcess> -->
-			<!-- </configuration> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <goals> -->
-			<!-- <goal>generate-html</goal> -->
-			<!-- <goal>generate-pdf</goal> -->
-			<!-- </goals> -->
-			<!-- <phase>pre-site</phase> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- </plugin> -->
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
-	<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>
-				<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>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<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>
+			<url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</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>
@@ -571,33 +446,17 @@ limitations under the License.
 			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${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> -->
-	<!-- <distributionManagement> -->
-	<!-- <repository> -->
-	<!-- <id>localrepo</id> -->
-	<!-- <name>Internal Release Repository</name> -->
-	<!-- <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/argeo-commons-${developmentCycle.argeo-commons}</url> -->
-	<!-- </site> -->
-	<!-- </distributionManagement> -->
-	<!-- </profile> -->
-	<!-- <profile> -->
-	<!-- <id>el5</id> -->
-	<!-- <properties> -->
-	<!-- <rpm.release>5</rpm.release> -->
-	<!-- <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository> -->
-	<!-- </properties> -->
-	<!-- </profile> -->
-	<!-- </profiles> -->
+	<profiles>
+		<profile>
+			<id>localrepo</id>
+			<distributionManagement>
+				<repository>
+					<id>localrepo</id>
+					<name>Internal Release Repository</name>
+					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</repository>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>