<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
- <version>2.1.69</version>
+ <version>2.1.85</version>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<name>CMS Node</name>
<dependencies>
- <!-- Argeo Commons -->
+ <!-- Parent dependencies -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.client</artifactId>
- <version>2.1.69</version>
+ <version>2.1.85</version>
<type>pom</type>
</dependency>
+
+ <!-- Argeo Commons -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.node.api</artifactId>
- <version>2.1.69</version>
+ <version>2.1.85</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.cms</artifactId>
- <version>2.1.69</version>
+ <version>2.1.85</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.cms.ui</artifactId>
- <version>2.1.69</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.enterprise</artifactId>
- <version>2.1.69</version>
+ <artifactId>org.argeo.maintenance</artifactId>
+ <version>2.1.85</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.ext.jackrabbit</artifactId>
- <version>2.1.69</version>
+ <version>2.1.85</version>
</dependency>
-
- <!-- Argeo Commons UI -->
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.eclipse.ui</artifactId>
- <version>2.1.69</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.eclipse.ui.rap</artifactId>
- <version>2.1.69</version>
+ <artifactId>org.argeo.ext.equinox.jetty</artifactId>
+ <version>2.1.85</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> -->
+
+ <!-- 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.h2</artifactId>
- </dependency>
- <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>
</dependency>
- <!-- Jackrabbit -->
- <dependency>
- <groupId>org.argeo.tp.apache.jackrabbit</groupId>
- <artifactId>org.apache.jackrabbit.data</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache.jackrabbit</groupId>
- <artifactId>org.apache.jackrabbit.core</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>
- </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> -->
- <!-- UI -->
- <dependency>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.rwt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.core.commands</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.jface</artifactId>
- </dependency>
+ <!-- HTTP Server -->
<dependency>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.filedialog</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.fileupload</artifactId>
+ <groupId>org.argeo.tp.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.jetty</artifactId>
</dependency>
- <!-- TODO: remove Spring dependency -->
+ <!-- Jetty -->
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.beans</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.client</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.core</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.continuation</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.el</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.http</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.io</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.jmx</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.security</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.server</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.aspectj.weaver</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.servlet</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>org.aopalliance</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.servlets</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.aop</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.util</artifactId>
</dependency>
<dependency>
- <groupId>org.argeo.tp.spring</groupId>
- <artifactId>org.springframework.context</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.expression</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.instrument</artifactId>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.alpn.client</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.alpn.server</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.common</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.client</artifactId>
</dependency>
-
- <!-- Jetty -->
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.client</artifactId>
+ <artifactId>org.eclipse.jetty.http2.client.http</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.continuation</artifactId>
+ <artifactId>org.eclipse.jetty.http2.server</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http</artifactId>
+ <artifactId>org.eclipse.jetty.http2.hpack</artifactId>
+ </dependency>
+
+ <!-- Async -->
+ <dependency>
+ <groupId>org.argeo.tp.javax</groupId>
+ <artifactId>javax.websocket</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.io</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.api</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.jmx</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.common</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.security</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.client</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.server</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.server</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.servlet</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.servlets</artifactId>
+ <artifactId>org.eclipse.jetty.websocket.javax.websocket</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>
<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>
- <includeTypes>jar</includeTypes>
- <includeScope>runtime</includeScope>
- <useRepositoryLayout>true</useRepositoryLayout>
- </configuration>
- </execution>
- <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>
+ <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>
<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>
+ <!-- <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>
<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>
</goals>
<configuration>
<name>argeo-cms-node-tp</name>
- <projversion>${version.argeo-distribution}</projversion>
+ <projversion>${version.argeo-tp}</projversion>
<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>
projects / lgpl / argeo-commons.git / blobdiff