From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 16 Apr 2020 22:02:15 +0000 (+0300)
Subject: jakarta.activation-api imports package `com.sun.activation`
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=a1d18b9e5dd909d453778796f54dce4c13adae40;ds=sidebyside

jakarta.activation-api imports package `com.sun.activation`

* This import shall be made optional as jakarta has taken over EE

gitlab #486

Change-Id: I4114e83cfab287196a4422feb124b5a8f6e85f91
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 3e03472d8..8528800c2 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -22,6 +22,8 @@
         <jackson.version.actual>2.10.2.b0001</jackson.version.actual>
         <javax.version>3.1.0</javax.version>
         <jakarta.version>2.1.6</jakarta.version>
+        <jakarta.activation-api.version>1.2.1</jakarta.activation-api.version>
+        <jakarta.activation-api.version.actual>1.2.1.b0001</jakarta.activation-api.version.actual>
         <!-- This can be removed once jakarta version is bumped -->
         <jakarta.version.actual>2.1.6.b0005</jakarta.version.actual>
         <jersey.version>2.30.1</jersey.version>
@@ -449,6 +451,15 @@
                                      <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${org.apache.aries.spifly.dynamic.bundle.version}</id>
                                      <source>true</source>
                                  </artifact>
+                                <artifact>
+                                    <id>jakarta.activation:jakarta.activation-api:${jakarta.activation-api.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-Version>${jakarta.activation-api.version.actual}</Bundle-Version>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
+                                    </instructions>
+                                </artifact>
                                 <artifact>
                                     <id>jakarta.ws.rs:jakarta.ws.rs-api:${jakarta.version}</id>
                                     <source>true</source>