From d105c4cbc1e79b538f9a1ec7cb2afd4fd8c54919 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Thu, 12 May 2022 14:49:04 +0200
Subject: [PATCH] Require gson 2.9.0

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.tm4e.core/META-INF/MANIFEST.MF    |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.tm4e.ui/META-INF/MANIFEST.MF      |  2 +-
 target-platform/tm4e-target.target            | 25 ++++++++++++++-----
 7 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF
index 590ceaed1..e1754d4b8 100644
--- a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true
 Bundle-Version: 0.4.2.qualifier
 Require-Bundle: org.apache.batik.css;bundle-version="1.7.0";resolution:=optional,
  org.apache.batik.util;bundle-version="1.7.0";resolution:=optional,
- com.google.gson;resolution:=optional,
+ com.google.gson;bundle-version="2.9.0";resolution:=optional,
  org.eclipse.core.runtime,
  org.eclipse.tm4e.core
 Import-Package: org.junit.runner,
diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF
index 7846ad295..bbaf42547 100644
--- a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.tm4e.core
 Bundle-Version: 0.4.6.qualifier
 Require-Bundle: org.apache.batik.css;bundle-version="1.9.1";resolution:=optional,
  org.apache.batik.util;bundle-version="1.9.1";resolution:=optional,
- com.google.gson,
+ com.google.gson;bundle-version="2.9.0",
  com.google.guava;bundle-version="30.1.0",
  org.jcodings;bundle-version="1.0.57",
  org.joni;bundle-version="2.1.43",
diff --git a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF
index 5c2770ca0..fcd31c446 100644
--- a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Version: 0.4.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.jface.text,
  org.eclipse.ui.genericeditor,
- com.google.gson,
+ com.google.gson;bundle-version="2.9.0",
  org.eclipse.tm4e.core;bundle-version="0.4.4",
  org.eclipse.tm4e.ui;bundle-version="0.5.1",
  org.eclipse.core.runtime,
diff --git a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF
index 0f32288aa..736f241b7 100644
--- a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.5.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.tm4e.core;bundle-version="0.4.4",
  org.eclipse.core.runtime,
- com.google.gson,
+ com.google.gson;bundle-version="2.9.0",
  org.eclipse.equinox.preferences
 Export-Package: org.eclipse.tm4e.registry
 Bundle-Activator: org.eclipse.tm4e.registry.TMEclipseRegistryPlugin
diff --git a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF
index ecd5959e7..60fffffa8 100644
--- a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.tm4e.core,
  org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
- com.google.gson,
+ com.google.gson;bundle-version="2.9.0",
  org.eclipse.tm4e.ui,
  org.junit,
  org.junit.jupiter.api,
diff --git a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF
index 00da6fe94..6f432a976 100644
--- a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.tm4e.core;bundle-version="0.4.4",
  org.eclipse.core.filesystem,
  org.eclipse.tm4e.registry,
  org.eclipse.ui.ide;resolution:=optional,
- com.google.gson,
+ com.google.gson;bundle-version="2.9.0",
  com.google.guava,
  org.eclipse.e4.ui.css.swt.theme,
  org.eclipse.core.expressions,
diff --git a/target-platform/tm4e-target.target b/target-platform/tm4e-target.target
index 9ee5a0d2e..2abae88db 100644
--- a/target-platform/tm4e-target.target
+++ b/target-platform/tm4e-target.target
@@ -21,15 +21,28 @@
             <unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
             <unit id="org.eclipse.ui.trace" version="0.0.0"/>
             <repository location="https://download.eclipse.org/eclipse/updates/4.23/"/>
+        </location>
+        <location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+            <dependencies>
+                <dependency>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                    <version>2.9.0</version>
+                    <type>jar</type>
+                </dependency>
+            </dependencies>
+            <instructions><![CDATA[
+Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+version:               ${version_cleanup;${mvnVersion}}
+Bundle-SymbolicName:   com.google.${mvnArtifactId}
+Bundle-Version:        ${version}
+Import-Package:        *;resolution:=optional
+Export-Package:        *;version="${version}";-noimport:=true
+DynamicImport-Package: *
+]]></instructions>
         </location>
 	    <location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		    <dependencies>
-			    <dependency>
-				    <groupId>com.google.code.gson</groupId>
-				    <artifactId>gson</artifactId>
-				    <version>2.9.0</version>
-				    <type>jar</type>
-			    </dependency>
 			    <dependency>
 				    <groupId>org.jruby.joni</groupId>
 				    <artifactId>joni</artifactId>