<properties>
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- <version.argeo-commons>2.1.91</version.argeo-commons>
+ <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
<version.slc>2.1.17-SNAPSHOT</version.slc>
<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
<module>org.argeo.slc.runtime</module>
<module>org.argeo.slc.jcr</module>
- <!-- Runtime -->
- <module>org.argeo.slc.spring</module>
- <module>org.argeo.slc.support</module>
+ <!-- SLC Repo -->
<module>org.argeo.slc.repo</module>
<module>org.argeo.slc.factory</module>
+
+ <!-- Legacy Runtime -->
+ <module>org.argeo.slc.spring</module>
+ <module>org.argeo.slc.support</module>
<module>org.argeo.slc.launcher</module>
- <!-- Modules -->
+ <!-- Legacy Modules -->
<module>org.argeo.slc.agent</module>
<module>org.argeo.slc.agent.jcr</module>
<module>org.argeo.slc.server.repo</module>
- <!-- E4 -->
- <module>org.argeo.slc.e4</module>
-
<!-- Legacy UI -->
<module>org.argeo.slc.client.ui</module>
<module>org.argeo.slc.client.ui.dist</module>
</parent>
<artifactId>org.argeo.slc.dep.backend</artifactId>
<name>SLC Backend</name>
+ <properties>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ </properties>
<dependencies>
<!-- SLC Minimal -->
<dependency>
<version>2.1.18-SNAPSHOT</version>
</dependency>
- <!-- SLC Repo -->
- <dependency>
- <groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.slc.repo</artifactId>
- <version>2.1.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.slc.factory</artifactId>
- <version>2.1.18-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.server.repo</artifactId>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.argeo.tp.sdk</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.sdk</groupId>
- <artifactId>org.junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.sdk</groupId>
- <artifactId>org.redline-rpm</artifactId>
- </dependency>
<dependency>
<groupId>org.argeo.tp.misc</groupId>
<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
</mappings>
<requires>
<require>argeo-cms-platform</require>
- <require>argeo-cms-sdk-tp</require>
<require>slc-spring</require>
</requires>
</configuration>
<!-- Parent dependencies -->
<dependency>
<groupId>org.argeo.commons</groupId>
- <artifactId>org.argeo.dep.cms.sdk</artifactId>
+ <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
<version>${version.argeo-commons}</version>
<type>pom</type>
</dependency>
<type>pom</type>
</dependency>
- <!-- CMS extensions -->
- <dependency>
- <groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.cms.integration</artifactId>
- <version>2.1.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.ext.equinox.jetty</artifactId>
- <version>2.1.18-SNAPSHOT</version>
- </dependency>
- <!-- Misc -->
- <dependency>
- <groupId>org.argeo.tp.apache.commons</groupId>
- <artifactId>org.apache.commons.vfs</artifactId>
- </dependency>
- <!-- Jackson JSON processor -->
- <dependency>
- <groupId>org.argeo.tp.jackson</groupId>
- <artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jackson</groupId>
- <artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jackson</groupId>
- <artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
- </dependency>
- <!-- HTTP2 -->
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.alpn.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.alpn.client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.alpn.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http2.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http2.client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http2.client.http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.http2.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <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.websocket.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.jetty</groupId>
- <artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
- </dependency>
-
- <!-- SSH -->
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.mina.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.tomcat.jni</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.sftp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.scp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.cli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.apache</groupId>
- <artifactId>org.apache.sshd.putty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.misc</groupId>
- <artifactId>net.i2p.crypto.eddsa</artifactId>
- </dependency>
-
-
-
-
- <dependency>
- <groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.slc.e4</artifactId>
- <version>2.1.18-SNAPSHOT</version>
- </dependency>
<!-- OSGi Boot for platform generation only, as it could be used by regular
Java applications to launch an OSGi runtime. -->
<goal>rpm</goal>
</goals>
<configuration>
- <name>slc-e4-rap</name>
+ <name>argeo-slc-e4-rap</name>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<requires>
<require>argeo-cms-e4-rap</require>
<require>argeo-cms-sdk-tp</require>
- <require>slc-agent</require>
+ <require>argeo-slc</require>
</requires>
</configuration>
</execution>
-<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.slc</groupId>
<version>${version.argeo-commons}</version>
<type>pom</type>
</dependency>
-
- <!-- Absolutely minimal SLC Agent -->
+ <dependency>
+ <groupId>org.argeo.commons</groupId>
+ <artifactId>org.argeo.dep.cms.ext</artifactId>
+ <version>${version.argeo-commons}</version>
+ <type>pom</type>
+ </dependency>
+
+ <!-- SLC Runtime -->
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.api</artifactId>
<version>2.1.18-SNAPSHOT</version>
</dependency>
+ <!-- SLC Repo -->
+ <dependency>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>org.argeo.slc.repo</artifactId>
+ <version>2.1.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>org.argeo.slc.factory</artifactId>
+ <version>2.1.18-SNAPSHOT</version>
+ </dependency>
+
+ <!-- CMS extensions -->
+ <dependency>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>org.argeo.cms.integration</artifactId>
+ <version>2.1.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>org.argeo.ext.equinox.jetty</artifactId>
+ <version>2.1.18-SNAPSHOT</version>
+ </dependency>
+
<!-- CLI Agent -->
<!-- <dependency> -->
<!-- <groupId>org.argeo.slc</groupId> -->
<!-- <version>2.1.1-SNAPSHOT</version> -->
<!-- </dependency> -->
+ <!-- SDK Third Parties -->
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>org.junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>org.hamcrest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>org.redline-rpm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>org.argeo.tp.apache.commons</groupId>
+ <artifactId>org.apache.commons.vfs</artifactId>
+ </dependency>
+
+ <!-- HTTP2 -->
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.alpn.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.alpn.client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.alpn.server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.http2.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.http2.client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.http2.client.http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.http2.server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <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.websocket.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.jetty</groupId>
+ <artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
+ </dependency>
+
+ <!-- SSH -->
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.tomcat.jni</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.sftp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.scp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.apache</groupId>
+ <artifactId>org.apache.sshd.putty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.misc</groupId>
+ <artifactId>net.i2p.crypto.eddsa</artifactId>
+ </dependency>
+
+
+
+
</dependencies>
<profiles>
<profile>
<goal>rpm</goal>
</goals>
<configuration>
- <name>slc-agent</name>
+ <name>argeo-slc</name>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
</mappings>
<requires>
<require>argeo-cms-node</require>
+ <require>argeo-slc-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.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-slc-tp</name>
+ <projversion>${version.argeo-tp}</projversion>
+ <release>${maven.build.timestamp}</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>
+ <requires>
+ <require>argeo-cms-ext-tp</require>
</requires>
</configuration>
</execution>
</parent>
<artifactId>org.argeo.slc.dep.spring</artifactId>
<name>SLC Agent based on Spring</name>
+ <properties>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ </properties>
<dependencies>
<!-- Parent dependencies -->
<dependency>
</mappings>
<requires>
<require>argeo-cms-node</require>
+ <require>argeo-slc</require>
+ <require>argeo-slc-tp</require>
<require>slc-spring-tp</require>
</requires>
</configuration>
<packaging>pom</packaging>
<modules>
<module>org.argeo.slc.dep.minimal</module>
- <module>org.argeo.slc.dep.spring</module>
<module>org.argeo.slc.dep.e4.rap</module>
- <module>org.argeo.slc.dep.spring.e4.rap</module>
<!-- Legacy -->
+ <module>org.argeo.slc.dep.spring</module>
<module>org.argeo.slc.dep.backend</module>
</modules>
<build>
</parent>
<artifactId>slc</artifactId>
<packaging>pom</packaging>
- <name>SLC Distribution</name>
+ <name>SLC Legacy Distribution</name>
+ <properties>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ </properties>
<profiles>
<profile>
<id>dist</id>
<goal>rpm</goal>
</goals>
<configuration>
- <name>slc-repo</name>
+ <name>slc-legacy</name>
<mappings>
<mapping>
<directory>/etc/argeo/conf.d</directory>
<properties>
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- <version.argeo-commons>2.1.91</version.argeo-commons>
+ <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
</properties>
<modules>
<module>org.argeo.legacy.fake.java8</module>
projects / gpl / argeo-slc.git / commitdiff