X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=c1adbe9f99038f26b9d8d7f52d8ad6e7c215c96b;hb=b6e64316eb5472b68f4673cbda3f1e375defe8fe;hp=83d83e76d523327db5dcb0da8426aae64fd77b84;hpb=e536b7a675138ca2d0257ac6b3b4d84ecb41efb5;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 83d83e76d..c1adbe9f9 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.commons</groupId>
@@ -32,21 +34,21 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.enterprise</artifactId>
+			<artifactId>org.argeo.ext.jackrabbit</artifactId>
 			<version>2.1.77-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.jackrabbit</artifactId>
+			<artifactId>org.argeo.ext.equinox.jetty</artifactId>
 			<version>2.1.77-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CMS Dependencies -->
 		<!-- TODO: not bitronix dependent -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>bitronix.tm</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>bitronix.tm</artifactId> -->
+		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.joda.time</artifactId> -->
@@ -63,10 +65,6 @@
 		</dependency>
 
 		<!-- Database drivers -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.h2</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.postgresql.jdbc42</artifactId>
@@ -121,142 +119,139 @@
 			<artifactId>com.vladsch.flexmark.formatter</artifactId>
 		</dependency>
 
-		<!-- Jackrabbit -->
+		<!-- Aries -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.aries.util</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> -->
+		<!-- </dependency> -->
+
+		<!-- HTTP Server -->
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.data</artifactId>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.core</artifactId>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
 		</dependency>
+
+		<!-- Jetty -->
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.server</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.continuation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.fileupload</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.core</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.io</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.parsers</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.jmx</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.lucene</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.security</artifactId>
 		</dependency>
-
-		<!-- TODO: remove Spring dependency -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.beans</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.server</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.servlets</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.xml</artifactId>
 		</dependency>
+
+		<!-- HTTP2 -->
 		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.server</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.common</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.expression</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.client.http</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.instrument</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.server</artifactId>
 		</dependency>
-
-		<!-- HTTP Server -->
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.hpack</artifactId>
 		</dependency>
+
+		<!-- Async -->
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.websocket</artifactId>
 		</dependency>
-
-		<!-- Jetty -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.client</artifactId> -->
-		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.continuation</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.io</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.client</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.jmx</artifactId> -->
-		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.security</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.server</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.servlet</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.servlets</artifactId> -->
-		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.util</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
 		</dependency>
-
 	</dependencies>
 
 	<profiles>