projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: edc4ee1)
Fix RPM deployment
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 14:31:38 +0000 (15:31 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 14:31:38 +0000 (15:31 +0100)
dep/org.argeo.dep.cms.node/pom.xml patch | blob | history
dep/org.argeo.dep.cms.platform/pom.xml patch | blob | history
dep/org.argeo.dep.cms.sdk/pom.xml patch | blob | history

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 87ed53f2250efd849ac7d7f56a8116b832062871..3dcf69e2b9b34c73a5008d56cbfb736da7967963 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -11,12 +11,14 @@
        <name>CMS Node</name>
        <dependencies>
 
-               <!-- Argeo Commons -->
+               <!-- Parent dependencies -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
                        <version>2.1.72-SNAPSHOT</version>
                </dependency>
+
+               <!-- Argeo Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.node.api</artifactId>
@@ -304,6 +306,7 @@
                                                                        <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
                                                                        <includeGroupIds>org.argeo.commons</includeGroupIds>
                                                                        <excludeTransitive>true</excludeTransitive>
+                                                                       <excludeArtifactIds>org.argeo.dep.cms.client</excludeArtifactIds>
                                                                        <includeTypes>jar</includeTypes>
                                                                        <includeScope>runtime</includeScope>
                                                                        <useRepositoryLayout>true</useRepositoryLayout>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 8bcf2ec4470d5eba417c30464a497f2edbf754bc..047eff1355e5aa792f737fb7dceb2ad784c53181 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -11,12 +11,14 @@
        <name>CMS Platform</name>
        <dependencies>
 
-               <!-- Argeo Commons -->
+               <!-- Parent dependencies -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
                        <version>2.1.72-SNAPSHOT</version>
                </dependency>
+
+               <!-- Argeo Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.workbench</artifactId>
@@ -280,6 +282,7 @@
                                                                        <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
                                                                        <includeGroupIds>org.argeo.commons</includeGroupIds>
                                                                        <excludeTransitive>true</excludeTransitive>
+                                                                       <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds>
                                                                        <includeTypes>jar</includeTypes>
                                                                        <includeScope>runtime</includeScope>
                                                                        <useRepositoryLayout>true</useRepositoryLayout>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index b6f7329cc5df2427d0425e20330bfe52b7f22af0..7f5f956e49b781aa1b1603e8f55ffdbf84dac971 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -10,6 +11,7 @@
        <artifactId>org.argeo.dep.cms.sdk</artifactId>
        <name>CMS SDK</name>
        <dependencies>
+               <!-- Parent dependencies -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.platform</artifactId>
@@ -39,42 +41,42 @@
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.dbunit</artifactId>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.api</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.spi</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.util</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.impl</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.file</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.api</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.spi</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.util</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.impl</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.aether</groupId> -->
+               <!-- <artifactId>org.eclipse.aether.transport.file</artifactId> -->
+               <!-- </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.redline-rpm</artifactId>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
-<!--                   <artifactId>org.tmatesoft.svnkit</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.sdk</groupId> -->
+               <!-- <artifactId>org.tmatesoft.svnkit</artifactId> -->
+               <!-- </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
@@ -83,15 +85,15 @@
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>org.eclipse.jgit</artifactId>
                </dependency>
-               
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>org.postgresql.postgresql</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>org.h2</artifactId> -->
-<!--           </dependency> -->
+
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.postgresql.postgresql</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.misc</groupId> -->
+               <!-- <artifactId>org.h2</artifactId> -->
+               <!-- </dependency> -->
        </dependencies>
 
        <profiles>
@@ -114,6 +116,7 @@
                                                                        <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
                                                                        <excludeGroupIds>org.argeo.commons</excludeGroupIds>
                                                                        <excludeTransitive>true</excludeTransitive>
+                                                                       <excludeArtifactIds>org.argeo.dep.cms.platform</excludeArtifactIds>
                                                                        <includeTypes>jar</includeTypes>
                                                                        <includeScope>runtime</includeScope>
                                                                        <useRepositoryLayout>true</useRepositoryLayout>
Argeo Commons - Lightweight integration framework in pure Java/OSGi