Rename minimal into base

diff --git a/dep/org.argeo.dep.cms.base/bnd.bnd b/dep/org.argeo.dep.cms.base/bnd.bnd
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dep/org.argeo.dep.cms.base/build.properties b/dep/org.argeo.dep.cms.base/build.properties
new file mode 100644 (file)
index 0000000..edef3d9
--- /dev/null
+++ b/dep/org.argeo.dep.cms.base/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               modularDistribution.csv

diff --git a/dep/org.argeo.dep.cms.base/p2.inf b/dep/org.argeo.dep.cms.base/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.dep.cms.base/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.base/pom.xml b/dep/org.argeo.dep.cms.base/pom.xml
new file mode 100644 (file)
index 0000000..0ecb022
--- /dev/null
+++ b/dep/org.argeo.dep.cms.base/pom.xml
@@ -0,0 +1,379 @@
+<?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">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons</groupId>
+               <version>2.3-SNAPSHOT</version>
+               <artifactId>dep</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.dep.cms.base</artifactId>
+       <name>CMS Base</name>
+       <dependencies>
+
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.init</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.util</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons</groupId> -->
+               <!-- <artifactId>org.argeo.jcr</artifactId> -->
+               <!-- <version>2.3-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons</groupId> -->
+               <!-- <artifactId>org.argeo.core</artifactId> -->
+               <!-- <version>2.3-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.api</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.tp</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.pgsql</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Third Parties -->
+
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.apache</groupId> -->
+               <!-- <artifactId>org.apache.log4j</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.slf4j.log4j12</artifactId> -->
+               <!-- </dependency> -->
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>org.slf4j.api</artifactId>
+               </dependency>
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>slf4j.osgi</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.slf4j.commons.logging</artifactId> -->
+               <!-- </dependency> -->
+
+               <!-- OSGi annotations -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
+               <!-- <artifactId>osgi.annotation</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
+               <!-- <artifactId>org.osgi.service.metatype.annotations</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
+               <!-- <artifactId>org.osgi.service.component.annotations</artifactId> -->
+               <!-- </dependency> -->
+
+               <!-- Bouncycastle -->
+               <dependency>
+                       <groupId>org.argeo.tp.bouncycastle</groupId>
+                       <artifactId>bcprov</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.bouncycastle</groupId>
+                       <artifactId>bcpkix</artifactId>
+               </dependency>
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+               <!-- <artifactId>bcpg</artifactId> -->
+               <!-- </dependency> -->
+
+               <!-- Apache Commons -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache.commons</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.commons</groupId>
+                       <artifactId>org.apache.commons.codec</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.commons</groupId>
+                       <artifactId>org.apache.commons.httpclient</artifactId>
+               </dependency>
+
+               <!-- Equinox -->
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.osgi.util</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.util</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.cm</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.osgi.services</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.registry</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.preferences</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.common</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.event</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.app</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.ds</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.metatype</artifactId>
+               </dependency>
+
+               <!-- Equinox Console -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache.felix</groupId>
+                       <artifactId>org.apache.felix.scr</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.felix</groupId>
+                       <artifactId>org.apache.felix.gogo.runtime</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.felix</groupId>
+                       <artifactId>org.apache.felix.gogo.shell</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.console</artifactId>
+               </dependency>
+
+               <!-- Servlet -->
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.servlet</artifactId>
+               </dependency>
+
+               <!-- HTTP Server -->
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.jetty</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>
+               <dependency>
+                       <groupId>org.argeo.tp.jetty</groupId>
+                       <artifactId>org.eclipse.jetty.servlet</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>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.jetty</groupId>
+                       <artifactId>org.eclipse.jetty.xml</artifactId>
+               </dependency>
+
+               <!-- Database drivers -->
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>org.postgresql.jdbc42</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.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-base${argeo.rpm.suffix}</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>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-base-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</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.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-base-tp${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${argeo.rpm.release.tp}</release>
+                                                                       <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>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.minimal/bnd.bnd b/dep/org.argeo.dep.cms.minimal/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/dep/org.argeo.dep.cms.minimal/build.properties b/dep/org.argeo.dep.cms.minimal/build.properties
deleted file mode 100644 (file)
index edef3d9..0000000
--- a/dep/org.argeo.dep.cms.minimal/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               modularDistribution.csv

diff --git a/dep/org.argeo.dep.cms.minimal/p2.inf b/dep/org.argeo.dep.cms.minimal/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/dep/org.argeo.dep.cms.minimal/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.minimal/pom.xml b/dep/org.argeo.dep.cms.minimal/pom.xml
deleted file mode 100644 (file)
index 6df8690..0000000
--- a/dep/org.argeo.dep.cms.minimal/pom.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.dep.cms.minimal</artifactId>
-       <name>CMS Minimal</name>
-       <dependencies>
-
-               <!-- Argeo Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.init</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.util</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.commons</groupId> -->
-               <!-- <artifactId>org.argeo.jcr</artifactId> -->
-               <!-- <version>2.3-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.commons</groupId> -->
-               <!-- <artifactId>org.argeo.core</artifactId> -->
-               <!-- <version>2.3-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.cms.tp</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.cms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.cms.pgsql</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Third Parties -->
-
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.apache</groupId> -->
-               <!-- <artifactId>org.apache.log4j</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.misc</groupId> -->
-               <!-- <artifactId>org.slf4j.log4j12</artifactId> -->
-               <!-- </dependency> -->
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.slf4j.api</artifactId>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.misc</groupId> -->
-               <!-- <artifactId>slf4j.osgi</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.misc</groupId> -->
-               <!-- <artifactId>org.slf4j.commons.logging</artifactId> -->
-               <!-- </dependency> -->
-
-               <!-- OSGi annotations -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
-               <!-- <artifactId>osgi.annotation</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
-               <!-- <artifactId>org.osgi.service.metatype.annotations</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
-               <!-- <artifactId>org.osgi.service.component.annotations</artifactId> -->
-               <!-- </dependency> -->
-
-               <!-- Bouncycastle -->
-               <dependency>
-                       <groupId>org.argeo.tp.bouncycastle</groupId>
-                       <artifactId>bcprov</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.bouncycastle</groupId>
-                       <artifactId>bcpkix</artifactId>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
-               <!-- <artifactId>bcpg</artifactId> -->
-               <!-- </dependency> -->
-
-               <!-- Apache Commons -->
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.io</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.codec</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.httpclient</artifactId>
-               </dependency>
-
-               <!-- Equinox -->
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.osgi.util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.cm</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.osgi.services</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.registry</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.preferences</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.common</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.event</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.app</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.ds</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.metatype</artifactId>
-               </dependency>
-
-               <!-- Equinox Console -->
-               <dependency>
-                       <groupId>org.argeo.tp.apache.felix</groupId>
-                       <artifactId>org.apache.felix.scr</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.felix</groupId>
-                       <artifactId>org.apache.felix.gogo.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.felix</groupId>
-                       <artifactId>org.apache.felix.gogo.shell</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.console</artifactId>
-               </dependency>
-
-               <!-- Servlet -->
-               <dependency>
-                       <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
-
-               <!-- HTTP Server -->
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.jetty</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>
-               <dependency>
-                       <groupId>org.argeo.tp.jetty</groupId>
-                       <artifactId>org.eclipse.jetty.servlet</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>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jetty</groupId>
-                       <artifactId>org.eclipse.jetty.xml</artifactId>
-               </dependency>
-
-               <!-- Database drivers -->
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.postgresql.jdbc42</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.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-minimal${argeo.rpm.suffix}</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>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-cms-minimal-tp${argeo.rpm.suffix}</require>
-                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</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.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-minimal-tp${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${argeo.rpm.release.tp}</release>
-                                                                       <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>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 7f1ca14ce68fa128d6be3f8f38f5fd71e6489bd6..bd29ff6b18b56caf9e0d7ccdb6162da036633cbf 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -17,7 +17,7 @@
                <!-- Parent dependencies -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.minimal</artifactId>
+                       <artifactId>org.argeo.dep.cms.base</artifactId>
                        <version>2.3-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
@@ -267,7 +267,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-minimal{argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-base{argeo.rpm.suffix}</require>
                                                                                <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
@@ -330,7 +330,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-minimal-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-base-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --git a/dep/pom.xml b/dep/pom.xml
index a066a25a93fde5263694f1bf4253fb08f6b8ae99..afbc3ea58271e4227537543bf8568aeea00a82fc 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -11,7 +11,7 @@
        <name>Commons Modular Distributions</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.dep.cms.minimal</module>
+               <module>org.argeo.dep.cms.base</module>
                <module>org.argeo.dep.cms.node</module>
                <module>org.argeo.dep.cms.ext</module>
                <module>org.argeo.dep.cms.ui.rcp</module>