Fixed poms

This commit is contained in:
FabioISTI 2020-05-20 15:19:06 +02:00
parent f3eca4ce96
commit d2522d0a54
9 changed files with 44 additions and 68 deletions

View File

@ -20,18 +20,6 @@
<url>${gitBaseUrl}/gFeed</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>1.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@ -50,7 +38,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>collectors-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
<scope>provided</scope>
</dependency>
@ -76,7 +64,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>test-commons</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
<scope>test</scope>
</dependency>

View File

@ -26,7 +26,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>commons</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
</dependencies>
</project>

View File

@ -28,7 +28,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>commons</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
</dependencies>
</project>

View File

@ -20,18 +20,7 @@
<url>${gitBaseUrl}/gFeed</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>1.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>

View File

@ -17,18 +17,6 @@
<developerConnection>scm:git:${gitBaseUrl}/gFeed</developerConnection>
<url>${gitBaseUrl}/gFeed</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>1.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@ -46,7 +34,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>catalogue-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
@ -60,7 +48,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>test-commons</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
<scope>test</scope>
</dependency>

View File

@ -29,14 +29,14 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>collectors-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>catalogue-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>

View File

@ -18,18 +18,6 @@
<url>${gitBaseUrl}/gFeed</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>1.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@ -48,7 +36,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>collectors-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
<scope>provided</scope>
</dependency>
@ -78,7 +66,7 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>test-commons</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
<scope>test</scope>
</dependency>

39
pom.xml
View File

@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@ -14,10 +15,10 @@
<description>gCat-Feeder Suite of components : service, plugin framework, plugins</description>
<properties>
<properties>
<distroDirectory>distro</distroDirectory>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<gFeedSuiteVersion>1.0.2</gFeedSuiteVersion>
<gFeedSuiteVersion>1.0.2-SNAPSHOT</gFeedSuiteVersion>
</properties>
<scm>
@ -52,21 +53,20 @@
<version>1.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- TEST -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
<scope>test</scope>
</dependency>
@ -79,4 +79,27 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.0.1</version>
<configuration>
<updatePomFile>true</updatePomFile>
<outputDirectory>target</outputDirectory>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -21,14 +21,14 @@
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>collectors-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
<dependency>
<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
<artifactId>catalogue-plugin-framework</artifactId>
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
<version>${gFeedSuiteVersion}</version>
</dependency>
<dependency>