From 8603a225ac3ab421c99fcb9bd1a0233b9ab99eda Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 25 Nov 2016 15:08:24 +0200
Subject: [PATCH] Include Jackson XML/CSV dataformat libraries in external
 components

The following new bundles were added:
* com.fasterxml.jackson.core.jackson-annotations/2.8.0
* com.fasterxml.jackson.core.jackson-databind/2.8.5
* com.fasterxml.jackson.dataformat.jackson-dataformat-csv/2.8.5
* com.fasterxml.jackson.dataformat.jackson-dataformat-xml/2.8.5
* com.fasterxml.jackson.module.jackson-module-jaxb-annotations/2.8.5
* com.fasterxml.woodstox.woodstox-core/5.0.3
* stax2-api/3.1.4

The following upgrades were done:
* net.ucanaccess/3.0.6 -> 3.0.7

refs #6830

Change-Id: I7ec6ad098d9c2ad8d84faa0a444aa6afd02b0826
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 12 ++++++++--
 ...sdk.build.targetdefinition-semantum.target | 24 +++++++++++++++----
 ...imantics.sdk.build.targetdefinition.target | 24 +++++++++++++++----
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 8d13de615..bdb30e190 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -247,7 +247,7 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>net.sf.ucanaccess:ucanaccess:3.0.6</id>
+                                    <id>net.sf.ucanaccess:ucanaccess:3.0.7</id>
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>net.ucanaccess</Bundle-SymbolicName>
@@ -322,7 +322,15 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.2</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.5</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.5</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.5</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
index 5e9ecc8e3..e42b58148 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="222">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="223">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>
@@ -84,8 +84,20 @@
 <unit id="ch.qos.logback.classic.source" version="1.1.7"/>
 <unit id="ch.qos.logback.core" version="1.1.7"/>
 <unit id="ch.qos.logback.core.source" version="1.1.7"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.2"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.2"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
+<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
+<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
 <unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>
 <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
@@ -114,8 +126,8 @@
 <unit id="javax.vecmath" version="1.5.2"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
-<unit id="net.ucanaccess" version="3.0.6"/>
-<unit id="net.ucanaccess.source" version="3.0.6"/>
+<unit id="net.ucanaccess" version="3.0.7"/>
+<unit id="net.ucanaccess.source" version="3.0.7"/>
 <unit id="org.antlr.runtime" version="3.5.2"/>
 <unit id="org.antlr.runtime.source" version="3.5.2"/>
 <unit id="org.apache.log4j" version="1.2.17"/>
@@ -179,6 +191,8 @@
 <unit id="org.ini4j.source" version="0.5.4"/>
 <unit id="org.slf4j.api" version="1.7.20"/>
 <unit id="org.slf4j.api.source" version="1.7.20"/>
+<unit id="stax2-api" version="3.1.4"/>
+<unit id="stax2-api.source" version="3.1.4"/>
 <repository location="http://www.simantics.org/download/master/external-components/maven"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 2d9a3d3bb..d09693543 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="222">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="223">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
@@ -101,8 +101,20 @@
 <unit id="ch.qos.logback.classic.source" version="1.1.7"/>
 <unit id="ch.qos.logback.core" version="1.1.7"/>
 <unit id="ch.qos.logback.core.source" version="1.1.7"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.2"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.2"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
+<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
+<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
 <unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>
 <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
@@ -131,8 +143,8 @@
 <unit id="javax.vecmath" version="1.5.2"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
-<unit id="net.ucanaccess" version="3.0.6"/>
-<unit id="net.ucanaccess.source" version="3.0.6"/>
+<unit id="net.ucanaccess" version="3.0.7"/>
+<unit id="net.ucanaccess.source" version="3.0.7"/>
 <unit id="org.antlr.runtime" version="3.5.2"/>
 <unit id="org.antlr.runtime.source" version="3.5.2"/>
 <unit id="org.apache.log4j" version="1.2.17"/>
@@ -196,6 +208,8 @@
 <unit id="org.ini4j.source" version="0.5.4"/>
 <unit id="org.slf4j.api" version="1.7.20"/>
 <unit id="org.slf4j.api.source" version="1.7.20"/>
+<unit id="stax2-api" version="3.1.4"/>
+<unit id="stax2-api.source" version="3.1.4"/>
 <repository location="http://www.simantics.org/download/master/external-components/maven"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-- 
2.47.1