diff options
-rw-r--r-- | build/org.eclipse.cdt.autotools-feature/feature.xml | 8 | ||||
-rw-r--r-- | build/org.eclipse.cdt.cmake-feature/feature.xml | 8 | ||||
-rw-r--r-- | build/org.eclipse.cdt.meson-feature/feature.xml | 8 | ||||
-rw-r--r-- | pom.xml | 9 | ||||
-rw-r--r-- | qt/org.eclipse.cdt.qt-feature/feature.xml | 8 | ||||
-rw-r--r-- | releng/org.eclipse.cdt.platform-feature/feature.xml | 8 | ||||
-rw-r--r-- | releng/org.eclipse.cdt.target/cdt.target | 6 | ||||
-rw-r--r-- | toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml | 8 |
8 files changed, 59 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.autotools-feature/feature.xml b/build/org.eclipse.cdt.autotools-feature/feature.xml index 86bffd42098..14967a84513 100644 --- a/build/org.eclipse.cdt.autotools-feature/feature.xml +++ b/build/org.eclipse.cdt.autotools-feature/feature.xml @@ -62,4 +62,12 @@ install-size="0" version="0.0.0"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/build/org.eclipse.cdt.cmake-feature/feature.xml index 4ce431986cc..3028b6da008 100644 --- a/build/org.eclipse.cdt.cmake-feature/feature.xml +++ b/build/org.eclipse.cdt.cmake-feature/feature.xml @@ -33,4 +33,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> diff --git a/build/org.eclipse.cdt.meson-feature/feature.xml b/build/org.eclipse.cdt.meson-feature/feature.xml index 971fbcfb74c..400f44413bf 100644 --- a/build/org.eclipse.cdt.meson-feature/feature.xml +++ b/build/org.eclipse.cdt.meson-feature/feature.xml @@ -46,4 +46,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> @@ -16,8 +16,8 @@ <properties> <required-maven-version>3.3.1</required-maven-version> - <tycho-version>1.2.0</tycho-version> - <tycho-extras-version>1.2.0</tycho-extras-version> + <tycho-version>1.3.0</tycho-version> + <tycho-extras-version>1.3.0</tycho-extras-version> <cbi-plugins.version>1.1.5</cbi-plugins.version> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <cdt-site>http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site> @@ -275,6 +275,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> <!-- Turn off doclint because javadocs are incomplete --> diff --git a/qt/org.eclipse.cdt.qt-feature/feature.xml b/qt/org.eclipse.cdt.qt-feature/feature.xml index f9d261d0749..2d1554e786a 100644 --- a/qt/org.eclipse.cdt.qt-feature/feature.xml +++ b/qt/org.eclipse.cdt.qt-feature/feature.xml @@ -37,4 +37,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml index f29db9af9f1..735915edcbe 100644 --- a/releng/org.eclipse.cdt.platform-feature/feature.xml +++ b/releng/org.eclipse.cdt.platform-feature/feature.xml @@ -156,4 +156,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 5802bc2fbb1..ca175ec092c 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="cdt" sequenceNumber="40"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="cdt" sequenceNumber="41"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="com.google.gson" version="0.0.0"/> @@ -74,10 +74,12 @@ <unit id="org.eclipse.tools.templates.core" version="0.0.0"/> <unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/> <unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/> +<unit id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0"/> <unit id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/> +<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/> <unit id="org.eclipse.tools.templates.ui" version="0.0.0"/> <unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.template-1.1.1-simrel-2018-12/"/> +<repository location="http://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.template-1.1.1-simrel-2018-12a/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="tm-feature.feature.group" version="0.0.0"/> diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml index dc1b28bf0e0..e3e6efb73ec 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml +++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml @@ -43,4 +43,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.tools.templates.freemarker.java11" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> |