Build fails when building against 2018-12
This change adds a new target platform for building against Eclipse
4.10 and makes this the default target platform.
Bug: 542525
Change-Id: I1738bf77496c1c00f6d8c88e99a8838f8ddaac3e
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/bundles/org.eclipse.epp.logging.aeri.core/pom.xml b/bundles/org.eclipse.epp.logging.aeri.core/pom.xml
index a827792..4c6d3b7 100644
--- a/bundles/org.eclipse.epp.logging.aeri.core/pom.xml
+++ b/bundles/org.eclipse.epp.logging.aeri.core/pom.xml
@@ -29,9 +29,9 @@
</dependencies>
<repositories>
<repository>
- <id>2018-09</id>
+ <id>2018-12</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/2018-09</url>
+ <url>http://download.eclipse.org/releases/2018-12</url>
</repository>
</repositories>
</configuration>
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
index fc1d252..b9af602 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/META-INF/MANIFEST.MF
@@ -54,13 +54,13 @@
org.apache.http.impl.client.cache;version="[4.3.0,5.0.0)",
org.apache.http.message;version="[4.3.0,5.0.0)",
org.apache.http.util;version="[4.3.0,5.0.0)",
- org.apache.lucene.analysis;core=split;version="[7.1.0,8.0.0)",
- org.apache.lucene.analysis.core;version="[7.1.0,8.0.0)",
- org.apache.lucene.document;version="[7.1.0,8.0.0)",
- org.apache.lucene.index;version="[7.1.0,8.0.0)",
- org.apache.lucene.search;version="[7.1.0,8.0.0)",
- org.apache.lucene.store;version="[7.1.0,8.0.0)",
- org.apache.lucene.util;version="[7.1.0,8.0.0)"
+ org.apache.lucene.analysis;core=split;version="[7.5.0,8.0.0)",
+ org.apache.lucene.analysis.core;version="[7.5.0,8.0.0)",
+ org.apache.lucene.document;core=split;version="[7.5.0,8.0.0)",
+ org.apache.lucene.index;core=split;version="[7.5.0,8.0.0)",
+ org.apache.lucene.search;core=split;version="[7.5.0,8.0.0)",
+ org.apache.lucene.store;core=split;version="[7.5.0,8.0.0)",
+ org.apache.lucene.util;version="[7.5.0,8.0.0)"
Export-Package: org.eclipse.epp.internal.logging.aeri.ide;x-internal:=true,
org.eclipse.epp.internal.logging.aeri.ide.server;x-internal:=true,
org.eclipse.epp.internal.logging.aeri.ide.server.json;x-internal:=true,
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
index ebb4cbf..6866221 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
@@ -29,9 +29,9 @@
</dependencies>
<repositories>
<repository>
- <id>2018-09</id>
+ <id>2018-12</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/2018-09</url>
+ <url>http://download.eclipse.org/releases/2018-12</url>
</repository>
</repositories>
</configuration>
diff --git a/features/org.eclipse.epp.logging.3rd.feature/feature.xml b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
index 36598f2..4a564a6 100644
--- a/features/org.eclipse.epp.logging.3rd.feature/feature.xml
+++ b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
@@ -108,14 +108,14 @@
id="org.apache.lucene.core"
download-size="0"
install-size="0"
- version="7.1.0.qualifier"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.lucene.analyzers-common"
download-size="0"
install-size="0"
- version="7.1.0.qualifier"
+ version="0.0.0"
unpack="false"/>
<plugin
diff --git a/pom.xml b/pom.xml
index 7dd46b8..223f42a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<tychoVersion>1.4.0</tychoVersion>
<!-- The default simultaneous release used to base the target platform
on (override with -Dsimrel=...) -->
- <simrel>2018-09</simrel>
+ <simrel>2018-12</simrel>
<!-- Use HTTP, as it provides the most firewall-friendly access to the
Git repository. -->
<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/epp/org.eclipse.epp.logging.git</tycho.scmUrl>
diff --git a/releng/targets/2018-12/2018-12.target b/releng/targets/2018-12/2018-12.target
new file mode 100644
index 0000000..c14cdf7
--- /dev/null
+++ b/releng/targets/2018-12/2018-12.target
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Target Definition for Eclipse 2018-12 (4.10)" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<!-- Release platform build for 2018-12 -->
+<repository location="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
+<!-- Release build for 2018-12 -->
+<repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.16"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/drops/3.25.0/v20180926-0301/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
+<unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
+<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
+<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javax.inject" version="1.0.0.v20091030"/>
+<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
+<unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
+<unit id="org.apache.lucene.core" version="7.5.0.v20181003-1532"/>
+<unit id="org.apache.lucene.analyzers-common" version="7.5.0.v20181003-1532"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+<unit id="org.junit" version="4.12.0.v201504281640"/>
+<unit id="org.mockito" version="1.9.5.v201605172210"/>
+<unit id="org.objenesis" version="1.0.0.v201505121915"/>
+<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+<unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/>
+<!-- Recommended Orbit build for 2018-12 -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
diff --git a/releng/targets/2018-12/pom.xml b/releng/targets/2018-12/pom.xml
new file mode 100644
index 0000000..fd7f368
--- /dev/null
+++ b/releng/targets/2018-12/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.epp.logging</groupId>
+ <artifactId>targets</artifactId>
+ <version>2.0.7-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>2018-12</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+
+ <name>Target Definition for Eclipse 2018-12 (4.10)</name>
+</project>
diff --git a/releng/targets/pom.xml b/releng/targets/pom.xml
index a44d60f..21646ba 100644
--- a/releng/targets/pom.xml
+++ b/releng/targets/pom.xml
@@ -17,6 +17,7 @@
<module>oxygen</module>
<module>photon</module>
<module>2018-09</module>
+ <module>2018-12</module>
</modules>
<build>
