From: Mathieu Baudier Date: Sun, 7 Nov 2021 11:04:33 +0000 (+0100) Subject: Use latest Argeo Commons Testing. X-Git-Tag: v2.1.18~14 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6039e7060cb6bdc0fac6f9dbfbf71470a6b4a617;p=gpl%2Fargeo-slc.git Use latest Argeo Commons Testing. --- diff --git a/cms/pom.xml b/cms/pom.xml index bb9ea66eb..fbd40ce19 100644 --- a/cms/pom.xml +++ b/cms/pom.xml @@ -13,7 +13,7 @@ 2.1.27 2.1.13 - 2.1.91 + 2.1.104-SNAPSHOT 2.1.17-SNAPSHOT 2015-02-12 @@ -32,21 +32,20 @@ org.argeo.slc.runtime org.argeo.slc.jcr - - org.argeo.slc.spring - org.argeo.slc.support + org.argeo.slc.repo org.argeo.slc.factory + + + org.argeo.slc.spring + org.argeo.slc.support org.argeo.slc.launcher - + org.argeo.slc.agent org.argeo.slc.agent.jcr org.argeo.slc.server.repo - - org.argeo.slc.e4 - org.argeo.slc.client.ui org.argeo.slc.client.ui.dist diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml index d1c34f696..171af696b 100644 --- a/dep/org.argeo.slc.dep.backend/pom.xml +++ b/dep/org.argeo.slc.dep.backend/pom.xml @@ -8,6 +8,9 @@ org.argeo.slc.dep.backend SLC Backend + + /srv/rpmfactory/legacy/argeo-osgi-2/argeo + @@ -36,17 +39,6 @@ 2.1.18-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.repo - 2.1.18-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.factory - 2.1.18-SNAPSHOT - org.argeo.slc org.argeo.slc.server.repo @@ -92,18 +84,6 @@ pom - - org.argeo.tp.sdk - biz.aQute.bndlib - - - org.argeo.tp.sdk - org.junit - - - org.argeo.tp.sdk - org.redline-rpm - org.argeo.tp.misc com.googlecode.javaewah.JavaEWAH @@ -166,7 +146,6 @@ argeo-cms-platform - argeo-cms-sdk-tp slc-spring diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml index e04ed2395..fa05eb016 100644 --- a/dep/org.argeo.slc.dep.e4.rap/pom.xml +++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml @@ -12,7 +12,7 @@ org.argeo.commons - org.argeo.dep.cms.sdk + org.argeo.dep.cms.e4.rap ${version.argeo-commons} pom @@ -23,149 +23,6 @@ pom - - - org.argeo.slc - org.argeo.cms.integration - 2.1.18-SNAPSHOT - - - org.argeo.slc - org.argeo.ext.equinox.jetty - 2.1.18-SNAPSHOT - - - - org.argeo.tp.apache.commons - org.apache.commons.vfs - - - - org.argeo.tp.jackson - com.fasterxml.jackson.core.jackson-core - - - org.argeo.tp.jackson - com.fasterxml.jackson.core.jackson-databind - - - org.argeo.tp.jackson - com.fasterxml.jackson.core.jackson-annotations - - - - org.argeo.tp.jetty - org.eclipse.jetty.alpn.api - - - org.argeo.tp.jetty - org.eclipse.jetty.alpn.client - - - org.argeo.tp.jetty - org.eclipse.jetty.alpn.server - - - org.argeo.tp.jetty - org.eclipse.jetty.http2.common - - - org.argeo.tp.jetty - org.eclipse.jetty.http2.client - - - org.argeo.tp.jetty - org.eclipse.jetty.http2.client.http - - - org.argeo.tp.jetty - org.eclipse.jetty.http2.server - - - org.argeo.tp.jetty - org.eclipse.jetty.http2.hpack - - - - - org.argeo.tp.javax - javax.websocket - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.api - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.common - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.client - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.server - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.servlet - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.javax.websocket - - - org.argeo.tp.jetty - org.eclipse.jetty.websocket.javax.websocket.server - - - - - org.argeo.tp.apache - org.apache.mina.core - - - org.argeo.tp.apache - org.apache.tomcat.jni - - - org.argeo.tp.apache - org.apache.sshd.core - - - org.argeo.tp.apache - org.apache.sshd.common - - - org.argeo.tp.apache - org.apache.sshd.sftp - - - org.argeo.tp.apache - org.apache.sshd.scp - - - org.argeo.tp.apache - org.apache.sshd.cli - - - org.argeo.tp.apache - org.apache.sshd.putty - - - org.argeo.tp.misc - net.i2p.crypto.eddsa - - - - - - - org.argeo.slc - org.argeo.slc.e4 - 2.1.18-SNAPSHOT - @@ -240,7 +97,7 @@ rpm - slc-e4-rap + argeo-slc-e4-rap /usr/share/osgi @@ -261,7 +118,7 @@ argeo-cms-e4-rap argeo-cms-sdk-tp - slc-agent + argeo-slc diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml index ef116af9a..83efaa3e0 100644 --- a/dep/org.argeo.slc.dep.minimal/pom.xml +++ b/dep/org.argeo.slc.dep.minimal/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.slc @@ -16,8 +18,14 @@ ${version.argeo-commons} pom - - + + org.argeo.commons + org.argeo.dep.cms.ext + ${version.argeo-commons} + pom + + + org.argeo.slc org.argeo.slc.api @@ -34,6 +42,30 @@ 2.1.18-SNAPSHOT + + + org.argeo.slc + org.argeo.slc.repo + 2.1.18-SNAPSHOT + + + org.argeo.slc + org.argeo.slc.factory + 2.1.18-SNAPSHOT + + + + + org.argeo.slc + org.argeo.cms.integration + 2.1.18-SNAPSHOT + + + org.argeo.slc + org.argeo.ext.equinox.jetty + 2.1.18-SNAPSHOT + + @@ -46,6 +78,147 @@ + + + org.argeo.tp.sdk + biz.aQute.bndlib + + + org.argeo.tp.sdk + org.junit + + + org.argeo.tp.sdk + org.hamcrest + + + org.argeo.tp.sdk + org.redline-rpm + + + org.argeo.tp.misc + com.googlecode.javaewah.JavaEWAH + + + org.argeo.tp.misc + org.eclipse.jgit + + + + + org.argeo.tp.apache.commons + org.apache.commons.vfs + + + + + org.argeo.tp.jetty + org.eclipse.jetty.alpn.api + + + org.argeo.tp.jetty + org.eclipse.jetty.alpn.client + + + org.argeo.tp.jetty + org.eclipse.jetty.alpn.server + + + org.argeo.tp.jetty + org.eclipse.jetty.http2.common + + + org.argeo.tp.jetty + org.eclipse.jetty.http2.client + + + org.argeo.tp.jetty + org.eclipse.jetty.http2.client.http + + + org.argeo.tp.jetty + org.eclipse.jetty.http2.server + + + org.argeo.tp.jetty + org.eclipse.jetty.http2.hpack + + + + + org.argeo.tp.javax + javax.websocket + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.api + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.common + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.client + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.server + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.servlet + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.javax.websocket + + + org.argeo.tp.jetty + org.eclipse.jetty.websocket.javax.websocket.server + + + + + org.argeo.tp.apache + org.apache.mina.core + + + org.argeo.tp.apache + org.apache.tomcat.jni + + + org.argeo.tp.apache + org.apache.sshd.core + + + org.argeo.tp.apache + org.apache.sshd.common + + + org.argeo.tp.apache + org.apache.sshd.sftp + + + org.argeo.tp.apache + org.apache.sshd.scp + + + org.argeo.tp.apache + org.apache.sshd.cli + + + org.argeo.tp.apache + org.apache.sshd.putty + + + org.argeo.tp.misc + net.i2p.crypto.eddsa + + + + + @@ -80,7 +253,7 @@ rpm - slc-agent + argeo-slc /usr/share/osgi @@ -100,6 +273,69 @@ argeo-cms-node + argeo-slc-tp + + + + + + + + + + rpmbuild-tp + + + + maven-assembly-plugin + + + prepare-source-tp + package + + single + + + + a2-source-tp + + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-tp + package + + rpm + + + argeo-slc-tp + ${version.argeo-tp} + ${maven.build.timestamp} + + + /usr/share/osgi + root + root + 644 + false + + + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp + + **/*.jar + + + + + + + argeo-cms-ext-tp diff --git a/dep/org.argeo.slc.dep.spring/pom.xml b/dep/org.argeo.slc.dep.spring/pom.xml index 0de07e518..cda79b6b5 100644 --- a/dep/org.argeo.slc.dep.spring/pom.xml +++ b/dep/org.argeo.slc.dep.spring/pom.xml @@ -8,6 +8,9 @@ org.argeo.slc.dep.spring SLC Agent based on Spring + + /srv/rpmfactory/legacy/argeo-osgi-2/argeo + @@ -210,6 +213,8 @@ argeo-cms-node + argeo-slc + argeo-slc-tp slc-spring-tp diff --git a/dep/pom.xml b/dep/pom.xml index 1278b3e34..924f06a7f 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -11,10 +11,9 @@ pom org.argeo.slc.dep.minimal - org.argeo.slc.dep.spring org.argeo.slc.dep.e4.rap - org.argeo.slc.dep.spring.e4.rap + org.argeo.slc.dep.spring org.argeo.slc.dep.backend diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml index 22e99a287..9cb648526 100644 --- a/dist/slc/pom.xml +++ b/dist/slc/pom.xml @@ -8,7 +8,10 @@ slc pom - SLC Distribution + SLC Legacy Distribution + + /srv/rpmfactory/legacy/argeo-osgi-2/argeo + dist @@ -125,7 +128,7 @@ rpm - slc-repo + slc-legacy /etc/argeo/conf.d diff --git a/legacy/pom.xml b/legacy/pom.xml index a99b43f96..e6c9c6b07 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -13,9 +13,9 @@ 2.1.27 2.1.13 - 2.1.91 + 2.1.104-SNAPSHOT - /srv/rpmfactory/testing/argeo-osgi-2/argeo + /srv/rpmfactory/legacy/argeo-osgi-2/argeo org.argeo.legacy.fake.java8