X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=6148eeb1133a5e2956365ec08f955c6ba5bbf74b;hb=8f0b18f9d5acc3a901a0795061355f3feea15cd1;hp=ed1b7d1671414d950811b389ede0d1a665b8a73f;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index ed1b7d167..6148eeb11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,81 +4,75 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.8</version>
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.88-SNAPSHOT</version>
+	<version>2.3.5</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.context>unstable</version.context>
 		<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>
-		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
+		<module>org.argeo.init</module>
 		<module>org.argeo.util</module>
-		<module>org.argeo.enterprise</module>
-		<module>org.argeo.jcr</module>
-		<module>org.argeo.osgi.boot</module>
-		<module>org.argeo.core</module>
-		<!-- Eclipse -->
-		<module>org.argeo.eclipse.ui</module>
-		<module>org.argeo.eclipse.ui.rap</module>
+		<!-- API -->
+		<module>org.argeo.api.uuid</module>
+		<module>org.argeo.api.acr</module>
+		<module>org.argeo.api.cms</module>
 		<!-- CMS -->
-		<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>
-		<!-- 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>
+		<module>org.argeo.cms.pgsql</module>
+		<!-- CMS SWT -->
+		<module>eclipse</module>
+		<!-- CMS JCR -->
+		<module>jcr</module>
+		<!-- Eclipse RAP/RCP specific -->
+		<module>rcp</module>
+		<module>rap</module>
 		<!-- Distribution -->
 		<module>dep</module>
-		<module>demo</module>
-		<module>doc</module>
 		<module>dist</module>
+		<module>sdk</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>argeo-commons-2.3.5</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>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.0.0</version>
+				<configuration>
+					<projectName>Argeo Commons</projectName>
+					<licenseName>lgpl_v3</licenseName>
+					<excludes>
+						<exclude>**/springutil/*</exclude>
+						<exclude>**/org/argeo/jcr/fs/Text.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -99,6 +93,11 @@ limitations under the License.
 					<groupId>org.argeo.tp.misc</groupId>
 					<artifactId>slf4j.osgi</artifactId>
 				</exclusion>
+				<!-- Make sure JTA is not used anymore -->
+				<exclusion>
+					<groupId>org.argeo.tp.javax</groupId>
+					<artifactId>javax.transaction-api</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
@@ -123,23 +122,18 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.3</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>
+			<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>never</updatePolicy>
@@ -150,15 +144,15 @@ limitations under the License.
 			</snapshots>
 		</repository>
 		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://snapshots.argeo.org/data/java/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>always</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 		<!-- Disable Maven default repository -->
@@ -195,7 +189,7 @@ limitations under the License.
 				<configuration>
 					<failOnError>false</failOnError>
 					<additionalJOption>-Xdoclint:none</additionalJOption>
-					<excludePackageNames>*.internal.*,org.eclipse.*,org.argeo.cms.ui.eclipse.forms.*</excludePackageNames>
+					<excludePackageNames>*.internal.*,org.eclipse.*,org.argeo.cms.ui.eclipse.*</excludePackageNames>
 					<encoding>UTF-8</encoding>
 					<detectLinks>true</detectLinks>
 					<links>
@@ -240,27 +234,4 @@ limitations under the License.
 			</plugin>
 		</plugins>
 	</reporting>
-	<profiles>
-		<profile>
-			<id>localrepo</id>
-			<repositories>
-				<repository>
-					<id>argeo</id>
-					<url>http://localhost:7080/data/java/argeo-2.1</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-			</repositories>
-			<distributionManagement>
-				<repository>
-					<id>staging</id>
-					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
-					<uniqueVersion>false</uniqueVersion>
-				</repository>
-			</distributionManagement>
-		</profile>
-	</profiles>
 </project>