From dc437804a238f57a12675f882ba2fbac7c79ef1a Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Tue, 11 Dec 2018 09:04:27 +0000
Subject: [PATCH] Bug 542644 - Add fragment for Java 11 JAXB dependencies

Allows org.eclipse.tools.templates.freemarker to work on both Java 8 &
Java 11.

Need to use Tycho 1.3.0 to allow this to build

Change-Id: I12287dec5acada2afa7130a15129598d41120cf6
---
 .../.project                                  | 22 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      | 11 ++++++++++
 .../OSGI-INF/l10n/bundle.properties           |  3 +++
 .../build.properties                          |  4 ++++
 .../META-INF/MANIFEST.MF                      |  2 --
 .../build.properties                          |  4 ++++
 pom.xml                                       |  8 ++++++-
 repo/category.xml                             |  6 +++++
 8 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.eclipse.tools.templates.freemarker.java11/.project
 create mode 100644 bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.tools.templates.freemarker.java11/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.tools.templates.freemarker.java11/build.properties

diff --git a/bundles/org.eclipse.tools.templates.freemarker.java11/.project b/bundles/org.eclipse.tools.templates.freemarker.java11/.project
new file mode 100644
index 00000000000..758a9b70b00
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.freemarker.java11/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.tools.templates.freemarker.java11</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..3336d950e27
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.tools.templates.freemarker.java11;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Fragment-Host: org.eclipse.tools.templates.freemarker;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.tools.templates.freemarker.java11
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Import-Package: javax.xml.bind;version="2.2.0",
+ javax.xml.bind.annotation;version="2.2.0"
diff --git a/bundles/org.eclipse.tools.templates.freemarker.java11/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.tools.templates.freemarker.java11/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..b15af9e4b24
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.freemarker.java11/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.tools.templates.freemarker.java11
+Bundle-Vendor = Eclipse CDT
+Bundle-Name = Template Engine Freemarker Support (Java 11)
\ No newline at end of file
diff --git a/bundles/org.eclipse.tools.templates.freemarker.java11/build.properties b/bundles/org.eclipse.tools.templates.freemarker.java11/build.properties
new file mode 100644
index 00000000000..60fce8ec180
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.freemarker.java11/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
index 847448ccee5..a88ba190da6 100644
--- a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
@@ -13,5 +13,3 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.freemarker
 Bundle-Vendor: %providerName
-Import-Package: javax.xml.bind;version="2.2.0",
- javax.xml.bind.annotation;version="2.2.0"
diff --git a/bundles/org.eclipse.tools.templates.freemarker/build.properties b/bundles/org.eclipse.tools.templates.freemarker/build.properties
index d944674ba0b..6850fe6a49b 100644
--- a/bundles/org.eclipse.tools.templates.freemarker/build.properties
+++ b/bundles/org.eclipse.tools.templates.freemarker/build.properties
@@ -4,3 +4,7 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                plugin.properties
+
+## Allow to build on Java 11 where no JAXB
+additional.bundles = javax.xml.bind
+jars.extra.classpath = platform:/plugin/javax.xml.bind
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bebfa3a614f..ecf21ea08b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>1.1.0</tycho-version>
+		<tycho-version>1.3.0</tycho-version>
 	</properties>
 
 	<licenses>
@@ -53,6 +53,7 @@
 		<module>bundles/org.eclipse.tools.templates.core</module>
 		<module>bundles/org.eclipse.tools.templates.freemarker</module>
 		<module>bundles/org.eclipse.tools.templates.ui</module>
+		<module>bundles/org.eclipse.tools.templates.freemarker.java11</module>
 
 		<module>repo</module>
 	</modules>
@@ -62,6 +63,11 @@
 			<id>cbi</id>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
+		<!--Use Staging repo until 1.3.0 release, required for Java 11 support-->
+		<pluginRepository>
+			<id>tycho-1.3-staged</id>
+			<url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-1050/</url>
+		</pluginRepository>
 	</pluginRepositories>
 	<profiles>
 		<profile>
diff --git a/repo/category.xml b/repo/category.xml
index 68d40e0213d..f5c3402ba09 100644
--- a/repo/category.xml
+++ b/repo/category.xml
@@ -9,9 +9,15 @@
    <bundle id="org.eclipse.tools.templates.freemarker" version="0.0.0">
       <category name="main"/>
    </bundle>
+   <bundle id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0">
+      <category name="main"/>
+   </bundle>
    <bundle id="org.eclipse.tools.templates.freemarker.source" version="0.0.0">
       <category name="main"/>
    </bundle>
+   <bundle id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0">
+      <category name="main"/>
+   </bundle>
    <bundle id="org.eclipse.tools.templates.ui" version="0.0.0">
       <category name="main"/>
    </bundle>