From 4d38705ef44b22806864cc90c6ec83453c4d62a5 Mon Sep 17 00:00:00 2001
From: Miro Richard Eklund <miro.eklund@semantum.fi>
Date: Wed, 12 Jul 2017 16:44:55 +0300
Subject: [PATCH] (refs #7358) Continued updating of oxygen target platform

Commit 1:
+ Include both com.sun.jna 4.1.0 and 4.3.0 to satisfy
nativemem and org.eclipse.epp.mpc.win32 dependencies.

Change-Id: I7373653241a038f8dd34184ae27bf4ab53d73d25
---
 bundles/org.simantics.nativemem/META-INF/MANIFEST.MF      | 4 ++--
 releng/org.simantics.sdk.build.p2.site/pom.xml            | 8 ++++++++
 .../org.simantics.sdk.build.targetdefinition.target       | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bundles/org.simantics.nativemem/META-INF/MANIFEST.MF b/bundles/org.simantics.nativemem/META-INF/MANIFEST.MF
index 3558861f9..5ea49f186 100644
--- a/bundles/org.simantics.nativemem/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.nativemem/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Vendor: Semantum Oy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Export-Package: org.simantics.nativemem
-Require-Bundle: com.sun.jna;bundle-version="4.1.0",
- com.sun.jna.platform;bundle-version="4.1.0"
+Require-Bundle: com.sun.jna;bundle-version="4.3.0",
+ com.sun.jna.platform;bundle-version="4.3.0"
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 2313d40d6..b5a9dd167 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -316,6 +316,14 @@
                                     <id>net.java.dev.jna:jna-platform:4.1.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>net.java.dev.jna:jna:4.3.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>net.java.dev.jna:jna-platform:4.3.0</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
                                     <source>true</source>
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 cecc523f2..9f397a634 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
@@ -170,6 +170,10 @@
 <unit id="com.sun.jna.platform" version="4.1.0"/>
 <unit id="com.sun.jna.platform.source" version="4.1.0"/>
 <unit id="com.sun.jna.source" version="4.1.0"/>
+<unit id="com.sun.jna" version="4.3.0"/>
+<unit id="com.sun.jna.platform" version="4.3.0"/>
+<unit id="com.sun.jna.platform.source" version="4.3.0"/>
+<unit id="com.sun.jna.source" version="4.3.0"/>
 <unit id="freemarker" version="2.3.23.stable"/>
 <unit id="freemarker.source" version="2.3.23.stable"/>
 <unit id="gnu.trove3" version="3.0.3"/>
-- 
2.43.2