<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
- <version>2.1.72</version>
+ <version>2.3.5</version>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.dep.cms.node</artifactId>
<name>CMS Node</name>
+
<dependencies>
<!-- Parent dependencies -->
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.dep.cms.client</artifactId>
- <version>2.1.72</version>
+ <artifactId>org.argeo.dep.cms.base</artifactId>
+ <version>2.3.5</version>
+ <type>pom</type>
</dependency>
<!-- Argeo Commons -->
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.node.api</artifactId>
- <version>2.1.72</version>
+ <artifactId>org.argeo.cms.servlet</artifactId>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.cms</artifactId>
- <version>2.1.72</version>
+ <artifactId>org.argeo.cms.jcr</artifactId>
+ <version>2.3.5</version>
</dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.argeo.commons</groupId> -->
+ <!-- <artifactId>org.argeo.maintenance</artifactId> -->
+ <!-- <version>2.3-SNAPSHOT</version> -->
+ <!-- </dependency> -->
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.cms.ui</artifactId>
- <version>2.1.72</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.enterprise</artifactId>
- <version>2.1.72</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.ext.jackrabbit</artifactId>
- <version>2.1.72</version>
- </dependency>
+ <!-- CMS Dependencies -->
+ <!-- <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> -->
- <!-- Argeo Commons UI -->
+ <!-- Apache Commons -->
<dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.eclipse.ui</artifactId>
- <version>2.1.72</version>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.dbcp</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.eclipse.ui.rap</artifactId>
- <version>2.1.72</version>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.pool</artifactId>
</dependency>
- <!-- CMS Dependencies -->
+ <!-- Javax -->
<dependency>
<groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.transaction</artifactId>
+ <artifactId>javax.jcr</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.el-api</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.annotation</artifactId>
+ <artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>javax.enterprise.cdi-api</artifactId>
</dependency>
-
- <!-- Database drivers -->
+ <!-- JTA is still indirectly required by Jackrabbit -->
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.h2</artifactId>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.postgresql.jdbc42</artifactId>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.annotation</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>com.google.gson</artifactId>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
+
<dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.xmlgraphics.commons</artifactId>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.net</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.w3c.dom.svg</artifactId>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.batik.i18n</artifactId>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.compress</artifactId>
</dependency>
+
+ <!-- Jackrabbit Dependencies -->
<dependency>
<groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.batik.util</artifactId>
+ <artifactId>org.apache.httpcomponents.httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.batik.css</artifactId>
+ <artifactId>org.apache.httpcomponents.httpclient</artifactId>
</dependency>
- <!-- Jackrabbit -->
+ <!-- Jackrabbit client -->
<dependency>
<groupId>org.argeo.tp.apache.jackrabbit</groupId>
- <artifactId>org.apache.jackrabbit.data</artifactId>
+ <artifactId>org.apache.jackrabbit.api</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache.jackrabbit</groupId>
- <artifactId>org.apache.jackrabbit.core</artifactId>
+ <artifactId>org.apache.jackrabbit.jcr.commons</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.apache.jackrabbit</groupId>
- <artifactId>org.apache.jackrabbit.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.tika.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.lucene</artifactId>
+ <artifactId>org.apache.jackrabbit.spi</artifactId>
</dependency>
-
- <!-- UI -->
<dependency>
- <groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>org.eclipse.rap.rwt</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.spi.commons</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>org.eclipse.core.commands</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.webdav</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>org.eclipse.rap.jface</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.spi2dav</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>org.eclipse.rap.filedialog</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.jcr2dav</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>org.eclipse.rap.fileupload</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
</dependency>
- <!-- TODO: remove Spring dependency -->
- <dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.beans</artifactId>
- </dependency>
+ <!-- Jackrabbit Repository -->
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.gemini</groupId>
- <artifactId>org.eclipse.gemini.blueprint.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.gemini</groupId>
- <artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.data</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.gemini</groupId>
- <artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.core</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.aspectj.weaver</artifactId>
+ <groupId>org.argeo.tp.apache.jackrabbit</groupId>
+ <artifactId>org.apache.jackrabbit.server</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.aopalliance</artifactId>
+ <artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.aop</artifactId>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.fileupload</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.context</artifactId>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.tika.core</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.expression</artifactId>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.tika.parsers</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.instrument</artifactId>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.lucene</artifactId>
</dependency>
- <!-- HTTP Server -->
+ <!-- Required by Jackrabbit 2.12 -->
<dependency>
- <groupId>org.argeo.tp.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.registry</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>com.google.guava</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.jetty</artifactId>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>com.google.guava.failureaccess</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>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.io</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>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.server</artifactId>
- </dependency>
+ <!-- Database drivers -->
<dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.servlet</artifactId>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>org.h2</artifactId>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-<!-- <artifactId>org.eclipse.jetty.servlets</artifactId> -->
-<!-- </dependency> -->
+
+ <!-- Third Parties -->
<dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.util</artifactId>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>com.google.gson</artifactId>
</dependency>
+ <!-- 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> -->
+
</dependencies>
<profiles>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>copy-argeo</id>
+ <id>prepare-source</id>
<phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>single</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>
+ <descriptorRefs>
+ <descriptorRef>a2-source</descriptorRef>
+ </descriptorRefs>
</configuration>
</execution>
</executions>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-node</name>
+ <name>argeo-cms-node${argeo.rpm.suffix}</name>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<directoryIncluded>false</directoryIncluded>
<sources>
<source>
- <location>${project.build.directory}/lib-argeo</location>
+ <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>
+ <require>argeo-cms-base{argeo.rpm.suffix}</require>
+ <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
</requires>
</configuration>
</execution>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>copy-tp</id>
+ <id>prepare-source-tp</id>
<phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>single</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>
+ <descriptorRefs>
+ <descriptorRef>a2-source-tp</descriptorRef>
+ </descriptorRefs>
</configuration>
</execution>
</executions>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-node-tp</name>
+ <name>argeo-cms-node-tp${argeo.rpm.suffix}</name>
<projversion>${version.argeo-tp}</projversion>
+ <release>${argeo.rpm.release.tp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<directoryIncluded>false</directoryIncluded>
<sources>
<source>
- <location>${project.build.directory}/lib-tp</location>
+ <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
<includes>
<include>**/*.jar</include>
</includes>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-client-tp</require>
+ <require>argeo-cms-base-tp${argeo.rpm.suffix}</require>
</requires>
</configuration>
</execution>