X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=pom.xml;h=5a1b188c00455f6e50210f826de25a1dc31b11b4;hp=18054cd70d41c2452319d4bd5d61b9f36acff1e8;hb=6e6286a551d04ee0993dc7930bd9744f7c9df10e;hpb=2669e5797bdf4bcfa3a15b273ca4239e215d9cd4

diff --git a/pom.xml b/pom.xml
index 18054cd70..5a1b188c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,27 +1,25 @@
 <?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>
+	<parent>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.3</version>
+	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.85-SNAPSHOT</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
-	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
+	<url>http://www.argeo.org/</url>
 	<properties>
-		<version.argeo-commons>2.1.85-SNAPSHOT</version.argeo-commons>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<!-- RPM -->
-		<argeo.rpm.release>7</argeo.rpm.release>
-		<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>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
-		<module>org.argeo.util</module>
 		<module>org.argeo.enterprise</module>
 		<module>org.argeo.jcr</module>
 		<module>org.argeo.osgi.boot</module>
@@ -30,340 +28,52 @@
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
-		<module>org.argeo.node.api</module>
+		<module>org.argeo.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>
+		<module>org.argeo.cms.ui.rap</module>
 		<!-- CMS E4 -->
 		<module>org.argeo.cms.e4</module>
 		<module>org.argeo.cms.e4.rap</module>
-		<!-- Third Parties Extensions -->
-		<module>org.argeo.ext.jackrabbit</module>
-		<module>org.argeo.ext.equinox.jetty</module>
-		<!-- Example -->
-		<module>example</module>
 		<!-- Distribution -->
-		<module>maven</module>
 		<module>dep</module>
 		<module>demo</module>
-		<module>doc</module>
 		<module>dist</module>
 	</modules>
 	<scm>
-		<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>
+		<connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
+		<url>http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git</developerConnection>
+		<tag>v2.x</tag>
 	</scm>
-	<inceptionYear>2007</inceptionYear>
+	<organization>
+		<name>Argeo GmbH</name>
+	</organization>
+	<inceptionYear>2009</inceptionYear>
 	<licenses>
 		<license>
-			<name>Apache 2</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<name>LGPL-3.0-or-later</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
 			<distribution>repo</distribution>
-			<comments><![CDATA[
-Argeo Commons Enterprise Framework
-			   
-Copyright (C) 2007-2016 Argeo GmbH
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-]]>
-			</comments>
 		</license>
 	</licenses>
 	<build>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.10</version>
-			</extension>
-		</extensions>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>ext/test</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>.*</exclude>
-					<exclude>.*/**</exclude>
-					<exclude>src/**</exclude>
-					<exclude>ext/**</exclude>
-					<exclude>target/**</exclude>
-					<exclude>bin/**</exclude>
-					<exclude>pom.xml</exclude>
-					<exclude>build.properties</exclude>
-					<exclude>*.bnd</exclude>
-					<exclude>*.target</exclude>
-					<exclude>**/*.xcf</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.8.1</version>
-					<configuration>
-						<!-- <source>1.8</source> -->
-						<source>11</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/test-classes</generatedTestSourcesDirectory>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.8.5</version>
-						</dependency>
-						<dependency>
-							<groupId>org.eclipse.jdt</groupId>
-							<artifactId>ecj</artifactId>
-							<version>3.19.0</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6.1</version>
-					<configuration>
-						<filesets>
-							<fileset>
-								<directory>META-INF</directory>
-								<includes>
-									<include>MANIFEST.MF</include>
-								</includes>
-							</fileset>
-						</filesets>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.18</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<archive>
-							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>3.1.0</version>
-					<configuration>
-						<excludes>
-							<exclude>**/*.class</exclude>
-							<!-- Prevents source jars to contain misleading data -->
-							<exclude>plugin.xml</exclude>
-							<exclude>META-INF/MANIFEST.MF</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.8</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.7</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.9</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.7</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.0.0</version>
-					<configuration>
-						<failOnError>false</failOnError>
-						<additionalJOption>-Xdoclint:none</additionalJOption>
-						<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
-						<encoding>UTF-8</encoding>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>pl.project13.maven</groupId>
-					<artifactId>git-commit-id-plugin</artifactId>
-					<version>3.0.0</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.1</version>
-					<configuration>
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>4.2.1</version>
-					<extensions>true</extensions>
-					<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.8</Bundle-RequiredExecutionEnvironment>
-							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
-							<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
-							<SLC-Category>${project.groupId}</SLC-Category>
-							<!-- Git metadata -->
-							<!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
-							<!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
-							<!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
-						</instructions>
-					</configuration>
-					<executions>
-						<execution>
-							<id>bundle-manifest</id>
-							<phase>process-classes</phase>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<!-- Codehaus -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1.4</version>
-					<extensions>true</extensions>
-					<configuration>
-						<version>${project.version}</version>
-						<distribution>argeo${argeo.rpm.release}</distribution>
-						<group>Applications/System</group>
-						<prefix>/usr</prefix>
-						<defaultDirMode>755</defaultDirMode>
-						<defaultFileMode>644</defaultFileMode>
-						<autoRequires>false</autoRequires>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.3.2</version>
-				</plugin>
-				<!-- Argeo -->
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>argeo-osgi-plugin</artifactId>
-					<version>2.1.1</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.0.0</version>
 				<configuration>
-					<filesets>
-						<fileset>
-							<directory>META-INF</directory>
-							<includes>
-								<include>MANIFEST.MF</include>
-							</includes>
-						</fileset>
-					</filesets>
+					<projectName>Argeo Commons</projectName>
+					<licenseName>lgpl_v3</licenseName>
+					<excludes>
+						<exclude>**/springutil/*</exclude>
+						<exclude>**/org/argeo/jcr/fs/Text.java</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>pl.project13.maven</groupId> -->
-			<!-- <artifactId>git-commit-id-plugin</artifactId> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <id>get-the-git-infos</id> -->
-			<!-- <goals> -->
-			<!-- <goal>revision</goal> -->
-			<!-- </goals> -->
-			<!-- <phase>initialize</phase> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- </plugin> -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<goals>deploy</goals>
-					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -407,13 +117,24 @@ limitations under the License.
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
+		</site>
+	</distributionManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 			<snapshots>
@@ -421,60 +142,29 @@ limitations under the License.
 			</snapshots>
 		</repository>
 		<repository>
-			<id>argeo-snapshots</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>argeo-maven-plugins</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>argeo-maven-plugins-snapshots</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
+		</repository>
+		<!-- Disable Maven default repository -->
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
 			<releases>
 				<enabled>false</enabled>
 			</releases>
 			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
+				<enabled>false</enabled>
 			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-	<distributionManagement>
-		<repository>
-			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
-			<uniqueVersion>false</uniqueVersion>
 		</repository>
-		<snapshotRepository>
-			<id>staging</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
-			<uniqueVersion>true</uniqueVersion>
-		</snapshotRepository>
-		<site>
-			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
-		</site>
-	</distributionManagement>
+	</repositories>
 	<reporting>
 		<plugins>
 			<plugin>
@@ -497,7 +187,7 @@ limitations under the License.
 				<configuration>
 					<failOnError>false</failOnError>
 					<additionalJOption>-Xdoclint:none</additionalJOption>
-					<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
+					<excludePackageNames>*.internal.*,org.eclipse.*,org.argeo.cms.ui.eclipse.*</excludePackageNames>
 					<encoding>UTF-8</encoding>
 					<detectLinks>true</detectLinks>
 					<links>
@@ -543,68 +233,12 @@ limitations under the License.
 		</plugins>
 	</reporting>
 	<profiles>
-		<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>
 		<profile>
 			<id>localrepo</id>
 			<repositories>
 				<repository>
 					<id>argeo</id>
-					<url>http://localhost:7080/data/java/argeo-2.1</url>
+					<url>http://localhost:7080/data/java/argeo-2.3</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -615,7 +249,7 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+					<url>dav:http://localhost:7080/data/java/argeo-2.3/</url>
 					<uniqueVersion>false</uniqueVersion>
 				</repository>
 			</distributionManagement>