<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.connect</groupId>
- <version>2.1.13-SNAPSHOT</version>
+ <groupId>org.argeo.commons</groupId>
+ <version>2.1.12-SNAPSHOT</version>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
- <artifactId>org.argeo.connect.dep.node.web</artifactId>
- <name>Connect Node Web Dependencies</name>
+ <artifactId>org.argeo.dep.cms</artifactId>
+ <name>CMS Dependencies</name>
<dependencies>
<!-- Connect -->
<dependency>
- <groupId>org.argeo.connect</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.cms</artifactId>
- <version>2.1.13-SNAPSHOT</version>
+ <version>2.1.12-SNAPSHOT</version>
</dependency>
<!-- Commons -->
<dependency>
- <groupId>org.argeo.commons.base</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.util</artifactId>
- <version>${version.argeo-commons}</version>
+ <version>2.1.12-SNAPSHOT</version>
</dependency>
<!-- Node (without RAP) -->
<dependency>
- <groupId>org.argeo.commons.security</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.security.dep.node</artifactId>
- <version>${version.argeo-commons}</version>
+ <version>2.1.12-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.argeo.tp</groupId>
<!-- Minimal web target platform -->
<dependency>
- <groupId>org.argeo.commons.base</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.eclipse.dep.rap</artifactId>
- <version>${version.argeo-commons}</version>
+ <version>2.1.12-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.argeo.tp.rap.platform</groupId>
<groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.rap.ui.views</artifactId>
</exclusion>
- <!-- Example, demos -->
- <exclusion>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.demo.controls</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.example</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>org.eclipse.rap.example.pages</artifactId>
- </exclusion>
</exclusions>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
</plugins>
</build>
<dependencies>
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp</groupId> -->
- <!-- <artifactId>org.eclipse.osgi</artifactId> -->
- <!-- </dependency> -->
-
<dependency>
<groupId>org.argeo.tp.rap.addons</groupId>
<artifactId>binaries</artifactId>
<version>${version.rap}</version>
<type>pom</type>
<exclusions>
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>javax.servlet</artifactId> -->
- <!-- </exclusion> -->
-
- <!-- Jetty -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.mortbay.jetty.server</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.mortbay.jetty.util</artifactId> -->
- <!-- </exclusion> -->
-
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.security</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.http</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.server</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.continuation</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.util</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.io</artifactId> -->
- <!-- </exclusion> -->
- <!-- <exclusion> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.jetty.servlet</artifactId> -->
- <!-- </exclusion> -->
-
<!-- Demo -->
<exclusion>
<groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.rap.design.example</artifactId>
</exclusion>
+ <!-- Example, demos -->
+ <exclusion>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>org.eclipse.rap.demo.controls</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>org.eclipse.rap.example</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>org.eclipse.rap.example.pages</artifactId>
+ </exclusion>
+
<!-- Troublesome bundles -->
<exclusion>
<groupId>org.argeo.tp.rap.platform</groupId>
</exclusions>
</dependency>
- <!-- Dependency to enable file upload. Should be included directly in coming
- rap distribution -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap</groupId> -->
- <!-- <artifactId>org.eclipse.rwt.widgets.upload</artifactId> -->
- <!-- </dependency> -->
- <!-- Needed by the bundle above -->
+ <!-- Needed by upload -->
<dependency>
<groupId>org.argeo.tp</groupId>
<artifactId>org.apache.commons.io</artifactId>
<artifactId>org.eclipse.equinox.security</artifactId>
</dependency>
- <!-- 2014-07-31 mbaudier : Removed, since it feels wrong to put an Argeo
- dependency here -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.commons</groupId> -->
- <!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
- <!-- <version>2.1.8-SNAPSHOT</version> -->
- <!-- </dependency> -->
</dependencies>
<profiles>
<profile>
<configuration>
<target>
<copy todir="${rpm.stagingRepository}" verbose="true">
- <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+ <fileset dir="${project.build.directory}/rpm"
+ includes="*/RPMS/**/*.rpm" />
<flattenmapper />
</copy>
</target>
<module>org.argeo.security.dep.node.eclipse</module>
<module>org.argeo.security.dep.node.rap</module>
<module>org.argeo.security.dep.node.rcp</module>
+ <module>org.argeo.dep.cms</module>
</modules>
<build>
<plugins>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.argeo.connect</groupId>
- <artifactId>argeo-connect</artifactId>
- <version>2.1.13-SNAPSHOT</version>
+ <groupId>org.argeo.commons</groupId>
+ <artifactId>argeo-commons</artifactId>
+ <version>2.1.12-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.cms</artifactId>
- <name>Connect Content Management System</name>
+ <name>Argeo Content Management System</name>
<packaging>jar</packaging>
-
- <!-- TODO move to parent -->
-
- <!-- <build> -->
- <!-- <plugins> -->
- <!-- <plugin> -->
- <!-- <groupId>org.apache.felix</groupId> -->
- <!-- <artifactId>maven-bundle-plugin</artifactId> -->
- <!-- <configuration> -->
- <!-- <instructions> -->
- <!-- Different from plugin -->
- <!-- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> -->
- <!-- <Bundle-Activator>org.argeo.connect.files.web.Activator</Bundle-Activator> -->
- <!-- <Require-Bundle>org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)"</Require-Bundle> -->
- <!-- <Import-Package> -->
- <!-- *, -->
- <!-- org.springframework.core -->
- <!-- </Import-Package> -->
- <!-- </instructions> -->
- <!-- </configuration> -->
- <!-- </plugin> -->
- <!-- </plugins> -->
- <!-- </build> -->
<dependencies>
<dependency>
- <groupId>org.argeo.commons.server</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.server.jcr</artifactId>
- <version>${version.argeo-commons}</version>
+ <version>2.1.12-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.argeo.commons.security</groupId>
+ <groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.security.core</artifactId>
- <version>${version.argeo-commons}</version>
+ <version>2.1.12-SNAPSHOT</version>
</dependency>
<!-- Files -->
<module>org.argeo.server.rap.webapp</module>
<!-- Node -->
<module>org.argeo.node.repo.jackrabbit</module>
+ <module>org.argeo.cms</module>
<!-- Standard Workbench Perspectives -->
<module>org.argeo.osgi.ui.explorer</module>
<module>org.argeo.jcr.ui.explorer</module>