mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 542644 - Add fragment for Java 11 JAXB dependencies

Browse source 
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
This commit is contained in:
William Riley 2018-12-11 09:04:27 +00:00 • committed by Jonah Graham
parent 4df497d908
commit dc437804a2
8 changed files with 57 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bundles/org.eclipse.tools.templates.freemarker.java11/.project Normal file
View file

@ -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>

11
bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF Normal file
View file

@ -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"

3
bundles/org.eclipse.tools.templates.freemarker.java11/OSGI-INF/l10n/bundle.properties Normal file
View file

@ -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)

4
bundles/org.eclipse.tools.templates.freemarker.java11/build.properties Normal file
View file

@ -0,0 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
OSGI-INF/l10n/bundle.properties

2
bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
View file

@ -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"

4
bundles/org.eclipse.tools.templates.freemarker/build.properties
View file

@ -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

8
pom.xml
View file

@ -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>

6
repo/category.xml
View file

@ -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>