X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=fb31f467052e8df1447e41e1311097d9b81d18e2;hb=6ae8470a5ac51df5240a2d86c3cfaf60ee279b40;hp=8da0ced83e1364d778cda30e4fb615f6a24ee482;hpb=147ada7da5bf6292569f17a53a77fca04c97f707;p=gpl%2Fargeo-suite.git

diff --git a/pom.xml b/pom.xml
index 8da0ced..fb31f46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,45 +1,44 @@
-<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.2</version>
+		<version>2.1.8</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<packaging>pom</packaging>
+	<version>2.3.3</version>
 	<name>Argeo Suite</name>
-	<description />
-	<version>2.1.16-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<url>http://www.argeo.org/</url>
 	<properties>
-		<version.argeo-suite>2.1.16-SNAPSHOT</version.argeo-suite>
+		<version.context>unstable</version.context>
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.89-SNAPSHOT</version.argeo-commons>
-		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
-
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+		<version.argeo-commons>2.3.5</version.argeo-commons>
+		<version.argeo-suite-icons>2.3.2</version.argeo-suite-icons>
 		<git.rw />
 	</properties>
 	<modules>
 		<!-- Entity Framework -->
-		<module>org.argeo.entity.api</module>
-		<module>org.argeo.entity.core</module>
-		<module>org.argeo.entity.ui</module>
+		<module>org.argeo.app.api</module>
+<!-- 		<module>org.argeo.entity.core</module> -->
+<!-- 		<module>org.argeo.entity.ui</module> -->
 
 		<!-- Argeo Suite -->
-		<module>org.argeo.suite.core</module>
-		<module>org.argeo.suite.ui</module>
-		<module>org.argeo.suite.ui.rap</module>
-		<module>org.argeo.suite.theme.default</module>
+		<module>org.argeo.app.core</module>
+		<module>org.argeo.app.ui</module>
+		<module>org.argeo.app.ui.rap</module>
+		<module>org.argeo.app.theme.default</module>
 
 		<!-- Functional areas -->
-		<module>library</module>
-		<module>publishing</module>
-		<module>knowledge</module>
+<!-- 		<module>org.argeo.people.ui</module> -->
+<!-- 		<module>org.argeo.library.ui</module> -->
+<!-- 		<module>org.argeo.geo.ui</module> -->
+		<module>org.argeo.app.servlet.publish</module>
+<!-- 		<module>org.argeo.support.xforms</module> -->
+		<module>org.argeo.app.servlet.odk</module>
+<!-- 		<module>org.argeo.support.geonames</module> -->
 
 		<!-- Packaging -->
 		<module>dep</module>
@@ -50,7 +49,7 @@
 		<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
 		<url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
 		<developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>argeo-suite-2.3.3</tag>
 	</scm>
 	<organization>
 		<name>Argeo GmbH</name>
@@ -58,7 +57,7 @@
 	<inceptionYear>2014</inceptionYear>
 	<licenses>
 		<license>
-			<name> 	GPL-3.0-or-later</name>
+			<name>GPL-3.0-or-later</name>
 			<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
 			<distribution>repo</distribution>
 		</license>
@@ -83,6 +82,11 @@
 					<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>
@@ -102,33 +106,32 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.extras</groupId>
-				<artifactId>argeo-tp-extras</artifactId>
-				<version>${version.argeo-tp-extras}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<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>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 		<repository>
-			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 			<releases>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 	<reporting>
@@ -199,9 +202,14 @@
 		</plugins>
 	</reporting>
 	<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.1/site/argeo-suite/</url>
+			<url>file:///srv/docfactory/argeo-2.3/site/argeo-suite/</url>
 		</site>
 	</distributionManagement>
 </project>