From: Mathieu Baudier Date: Wed, 5 Jan 2022 08:09:12 +0000 (+0100) Subject: Rename minimal into base X-Git-Tag: argeo-commons-2.3.5~100 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=e96a083b731800c0089660088279f0e232b5c6b6;p=lgpl%2Fargeo-commons.git 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 index 000000000..e69de29bb diff --git a/dep/org.argeo.dep.cms.base/build.properties b/dep/org.argeo.dep.cms.base/build.properties new file mode 100644 index 000000000..edef3d9d1 --- /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 index 000000000..0423aa509 --- /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 index 000000000..0ecb0220a --- /dev/null +++ b/dep/org.argeo.dep.cms.base/pom.xml @@ -0,0 +1,379 @@ + + + 4.0.0 + + org.argeo.commons + 2.3-SNAPSHOT + dep + .. + + org.argeo.dep.cms.base + CMS Base + + + + + org.argeo.commons + org.argeo.init + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.util + 2.3-SNAPSHOT + + + + + + + + + + + + + + org.argeo.commons + org.argeo.api + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms.tp + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms + 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.cms.pgsql + 2.3-SNAPSHOT + + + + + + + + + + + + + + org.argeo.tp.misc + org.slf4j.api + + + + + + + + + + + + + + + + + + + + + + + + + + + org.argeo.tp.bouncycastle + bcprov + + + org.argeo.tp.bouncycastle + bcpkix + + + + + + + + + org.argeo.tp.apache.commons + org.apache.commons.io + + + org.argeo.tp.apache.commons + org.apache.commons.codec + + + org.argeo.tp.apache.commons + org.apache.commons.httpclient + + + + + org.argeo.tp.equinox + org.eclipse.osgi.util + + + org.argeo.tp.equinox + org.eclipse.equinox.util + + + org.argeo.tp.equinox + org.eclipse.equinox.cm + + + org.argeo.tp.equinox + org.eclipse.osgi.services + + + org.argeo.tp.equinox + org.eclipse.equinox.registry + + + org.argeo.tp.equinox + org.eclipse.equinox.preferences + + + org.argeo.tp.equinox + org.eclipse.equinox.common + + + org.argeo.tp.equinox + org.eclipse.equinox.event + + + org.argeo.tp.equinox + org.eclipse.equinox.app + + + org.argeo.tp.equinox + org.eclipse.equinox.ds + + + org.argeo.tp.equinox + org.eclipse.equinox.metatype + + + + + org.argeo.tp.apache.felix + org.apache.felix.scr + + + org.argeo.tp.apache.felix + org.apache.felix.gogo.runtime + + + org.argeo.tp.apache.felix + org.apache.felix.gogo.shell + + + org.argeo.tp.equinox + org.eclipse.equinox.console + + + + + org.argeo.tp.javax + javax.servlet + + + + + org.argeo.tp.equinox + org.eclipse.equinox.http.servlet + + + org.argeo.tp.equinox + org.eclipse.equinox.http.jetty + + + + + org.argeo.tp.jetty + org.eclipse.jetty.client + + + org.argeo.tp.jetty + org.eclipse.jetty.continuation + + + org.argeo.tp.jetty + org.eclipse.jetty.http + + + org.argeo.tp.jetty + org.eclipse.jetty.io + + + org.argeo.tp.jetty + org.eclipse.jetty.jmx + + + org.argeo.tp.jetty + org.eclipse.jetty.security + + + org.argeo.tp.jetty + org.eclipse.jetty.server + + + org.argeo.tp.jetty + org.eclipse.jetty.servlet + + + org.argeo.tp.jetty + org.eclipse.jetty.servlets + + + org.argeo.tp.jetty + org.eclipse.jetty.util + + + org.argeo.tp.jetty + org.eclipse.jetty.xml + + + + + org.argeo.tp.misc + org.postgresql.jdbc42 + + + + + + rpmbuild + + + + maven-assembly-plugin + + + prepare-source + package + + single + + + + a2-source + + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-argeo + package + + rpm + + + argeo-cms-base${argeo.rpm.suffix} + + + /usr/share/osgi + root + root + 644 + false + + + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source + + **/*.jar + + + + + + + argeo-cms-base-tp${argeo.rpm.suffix} + argeo-osgi-boot${argeo.rpm.suffix} + + + + + + + + + + rpmbuild-tp + + + + maven-assembly-plugin + + + prepare-source-tp + package + + single + + + + a2-source-tp + + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-tp + package + + rpm + + + argeo-cms-base-tp${argeo.rpm.suffix} + ${version.argeo-tp} + ${argeo.rpm.release.tp} + + + /usr/share/osgi + root + root + 644 + false + + + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp + + **/*.jar + + + + + + + + + + + + + + \ 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 index e69de29bb..000000000 diff --git a/dep/org.argeo.dep.cms.minimal/build.properties b/dep/org.argeo.dep.cms.minimal/build.properties deleted file mode 100644 index edef3d9d1..000000000 --- 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 index 0423aa509..000000000 --- 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 index 6df8690b5..000000000 --- a/dep/org.argeo.dep.cms.minimal/pom.xml +++ /dev/null @@ -1,379 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - 2.3-SNAPSHOT - dep - .. - - org.argeo.dep.cms.minimal - CMS Minimal - - - - - org.argeo.commons - org.argeo.init - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.util - 2.3-SNAPSHOT - - - - - - - - - - - - - - org.argeo.commons - org.argeo.api - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.tp - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms - 2.3-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.pgsql - 2.3-SNAPSHOT - - - - - - - - - - - - - - org.argeo.tp.misc - org.slf4j.api - - - - - - - - - - - - - - - - - - - - - - - - - - - org.argeo.tp.bouncycastle - bcprov - - - org.argeo.tp.bouncycastle - bcpkix - - - - - - - - - org.argeo.tp.apache.commons - org.apache.commons.io - - - org.argeo.tp.apache.commons - org.apache.commons.codec - - - org.argeo.tp.apache.commons - org.apache.commons.httpclient - - - - - org.argeo.tp.equinox - org.eclipse.osgi.util - - - org.argeo.tp.equinox - org.eclipse.equinox.util - - - org.argeo.tp.equinox - org.eclipse.equinox.cm - - - org.argeo.tp.equinox - org.eclipse.osgi.services - - - org.argeo.tp.equinox - org.eclipse.equinox.registry - - - org.argeo.tp.equinox - org.eclipse.equinox.preferences - - - org.argeo.tp.equinox - org.eclipse.equinox.common - - - org.argeo.tp.equinox - org.eclipse.equinox.event - - - org.argeo.tp.equinox - org.eclipse.equinox.app - - - org.argeo.tp.equinox - org.eclipse.equinox.ds - - - org.argeo.tp.equinox - org.eclipse.equinox.metatype - - - - - org.argeo.tp.apache.felix - org.apache.felix.scr - - - org.argeo.tp.apache.felix - org.apache.felix.gogo.runtime - - - org.argeo.tp.apache.felix - org.apache.felix.gogo.shell - - - org.argeo.tp.equinox - org.eclipse.equinox.console - - - - - org.argeo.tp.javax - javax.servlet - - - - - org.argeo.tp.equinox - org.eclipse.equinox.http.servlet - - - org.argeo.tp.equinox - org.eclipse.equinox.http.jetty - - - - - org.argeo.tp.jetty - org.eclipse.jetty.client - - - org.argeo.tp.jetty - org.eclipse.jetty.continuation - - - org.argeo.tp.jetty - org.eclipse.jetty.http - - - org.argeo.tp.jetty - org.eclipse.jetty.io - - - org.argeo.tp.jetty - org.eclipse.jetty.jmx - - - org.argeo.tp.jetty - org.eclipse.jetty.security - - - org.argeo.tp.jetty - org.eclipse.jetty.server - - - org.argeo.tp.jetty - org.eclipse.jetty.servlet - - - org.argeo.tp.jetty - org.eclipse.jetty.servlets - - - org.argeo.tp.jetty - org.eclipse.jetty.util - - - org.argeo.tp.jetty - org.eclipse.jetty.xml - - - - - org.argeo.tp.misc - org.postgresql.jdbc42 - - - - - - rpmbuild - - - - maven-assembly-plugin - - - prepare-source - package - - single - - - - a2-source - - - - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-argeo - package - - rpm - - - argeo-cms-minimal${argeo.rpm.suffix} - - - /usr/share/osgi - root - root - 644 - false - - - ${project.build.directory}/${project.artifactId}-${project.version}-a2-source - - **/*.jar - - - - - - - argeo-cms-minimal-tp${argeo.rpm.suffix} - argeo-osgi-boot${argeo.rpm.suffix} - - - - - - - - - - rpmbuild-tp - - - - maven-assembly-plugin - - - prepare-source-tp - package - - single - - - - a2-source-tp - - - - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-tp - package - - rpm - - - argeo-cms-minimal-tp${argeo.rpm.suffix} - ${version.argeo-tp} - ${argeo.rpm.release.tp} - - - /usr/share/osgi - root - root - 644 - false - - - ${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp - - **/*.jar - - - - - - - - - - - - - - \ 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 7f1ca14ce..bd29ff6b1 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -17,7 +17,7 @@ org.argeo.commons - org.argeo.dep.cms.minimal + org.argeo.dep.cms.base 2.3-SNAPSHOT pom @@ -267,7 +267,7 @@ - argeo-cms-minimal{argeo.rpm.suffix} + argeo-cms-base{argeo.rpm.suffix} argeo-cms-node-tp${argeo.rpm.suffix} @@ -330,7 +330,7 @@ - argeo-cms-minimal-tp${argeo.rpm.suffix} + argeo-cms-base-tp${argeo.rpm.suffix} diff --git a/dep/pom.xml b/dep/pom.xml index a066a25a9..afbc3ea58 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -11,7 +11,7 @@ Commons Modular Distributions pom - org.argeo.dep.cms.minimal + org.argeo.dep.cms.base org.argeo.dep.cms.node org.argeo.dep.cms.ext org.argeo.dep.cms.ui.rcp