gCubeSystem
/
gcube-smartgears-bom-legacy
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/19283' 

Conflicts:
	pom.xml
This commit is contained in:
Luca Frosini 2020-10-08 13:02:06 +02:00
parent 096bfd75d4 57058a61f5
commit fdcf9f6155
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>1.2.0</version> <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>gCube Smartgears Bom</name> <name>gCube Smartgears Bom</name>
<description> <description>
@ -18,7 +18,7 @@
</description> </description>
<properties> <properties>
<jackson.version>2.6.0</jackson.version> <gcube-jackson.version>2.8.11</gcube-jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>1.5.0</version> <version>2.0.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -172,36 +172,23 @@
</dependency> </dependency>
<!-- END Declaring dependencies needed by a smartgears webapp --> <!-- END Declaring dependencies needed by a smartgears webapp -->
<!-- gCube Jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.gcube.common</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>gcube-jackson-databind</artifactId>
<version>${jackson.version}</version> <version>${gcube-jackson.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.gcube.common</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>gcube-jackson-annotations</artifactId>
<version>${jackson.version}</version> <version>${gcube-jackson.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.gcube.common</groupId>
<artifactId>jackson-core</artifactId> <artifactId>gcube-jackson-core</artifactId>
<version>${jackson.version}</version> <version>${gcube-jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- END gCube Jackson -->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>