X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=2e2b2b83dc45b5d4f7289ef01e1720ece6988544;hb=30736a826aac0d297c7411ee869506133b4d3929;hp=84e8a7a9f09e48b0890732780844f29e79f06d15;hpb=65e6b9b417d4b48d8daf1782b582bd7ca4f9da6c;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 84e8a7a9f..2e2b2b83d 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -1,10 +1,11 @@
 <?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"
+<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>
-		<version>2.1.31-SNAPSHOT</version>
+		<version>2.1.77-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -12,228 +13,423 @@
 	<name>CMS Node</name>
 	<dependencies>
 
-		<!-- Argeo Commons -->
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.77-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
+
+		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.node.api</artifactId>
+			<version>2.1.77-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.cms</artifactId>
+			<version>2.1.77-SNAPSHOT</version>
 		</dependency>
-
-		<!-- Argeo Commons UI -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.ext.jackrabbit</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>org.joda.time</artifactId> -->
+		<!-- </dependency> -->
+
+		<!-- Javax -->
 		<dependency>
 			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.transaction</artifactId>
+			<artifactId>javax.annotation</artifactId>
 		</dependency>
-		<!-- TODO: not bitronix dependent -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>bitronix.tm</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.inject</artifactId>
 		</dependency>
+
+		<!-- Database drivers -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.joda.time</artifactId>
+			<artifactId>org.postgresql.jdbc42</artifactId>
 		</dependency>
-
 		<!-- Third Parties -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.w3c.css.sac</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>com.steadystate.css</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.h2</artifactId>
+			<artifactId>com.google.gson</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.w3c.css.sac</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xmlgraphics.commons</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.steadystate.css</artifactId>
+			<artifactId>org.w3c.dom.svg</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.guava</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.i18n</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.gson</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.util</artifactId>
 		</dependency>
-
-		<!-- Jackrabbit -->
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.data</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.css</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.core</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.jsoup</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.server</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.vladsch.flexmark</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
+			<artifactId>com.vladsch.flexmark.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.fileupload</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.vladsch.flexmark.formatter</artifactId>
 		</dependency>
+		
+		<!-- Aries -->
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.core</artifactId>
+			<artifactId>org.apache.aries.util</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.lucene</artifactId>
+			<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
 		</dependency>
 
-		<!-- UI -->
-		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.rwt</artifactId>
-		</dependency>
+		<!-- HTTP Server -->
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.core.commands</artifactId>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.jface</artifactId>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
 		</dependency>
+
+		<!-- Jetty -->
 		<dependency>
-			<groupId>org.argeo.tp.rap</groupId>
-			<artifactId>org.eclipse.rap.addons.filedialog</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap</groupId>
-			<artifactId>org.eclipse.rap.addons.fileupload</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.continuation</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.http</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.io</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.jmx</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.inject</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.security</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.server</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.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.servlets</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.xml</artifactId>
 		</dependency>
+
+		<!-- HTTP2 -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.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.alpn.server</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.common</artifactId>
 		</dependency>
-
-		<!-- HTTP Server -->
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.registry</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.client</artifactId>
 		</dependency>
 		<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.client.http</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.server</artifactId>
 		</dependency>
-
-		<!-- Jetty -->
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.client</artifactId>
+			<artifactId>org.eclipse.jetty.http2.hpack</artifactId>
 		</dependency>
+
+		<!-- Async -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.continuation</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.websocket</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.io</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.jmx</artifactId>
+			<artifactId>org.eclipse.jetty.websocket.client</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>
+			<artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
 		</dependency>
+		<!-- Atmosphere -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.util</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.atmosphere.runtime</artifactId>
 		</dependency>
 
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <execution> -->
+					<!-- <id>copy-argeo</id> -->
+					<!-- <phase>package</phase> -->
+					<!-- <goals> -->
+					<!-- <goal>copy-dependencies</goal> -->
+					<!-- </goals> -->
+					<!-- <configuration> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+					<!-- <includeGroupIds>org.argeo.commons</includeGroupIds> -->
+					<!-- <excludeTransitive>true</excludeTransitive> -->
+					<!-- <excludeArtifactIds>org.argeo.dep.cms.client</excludeArtifactIds> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <includeScope>runtime</includeScope> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-cms-node</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<!-- <mapping> -->
+										<!-- <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
+										<!-- <username>root</username> -->
+										<!-- <groupname>root</groupname> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <artifact /> -->
+										<!-- </mapping> -->
+									</mappings>
+									<requires>
+										<require>argeo-cms-client</require>
+										<require>argeo-cms-node-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <execution> -->
+					<!-- <id>copy-tp</id> -->
+					<!-- <phase>package</phase> -->
+					<!-- <goals> -->
+					<!-- <goal>copy-dependencies</goal> -->
+					<!-- </goals> -->
+					<!-- <configuration> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
+					<!-- <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
+					<!-- <excludeTransitive>true</excludeTransitive> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <includeScope>runtime</includeScope> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-cms-node-tp</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-client-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file