rpms/eclipse
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import eclipse-4.16-7.module+el8.3.0+8498+807b4491

Browse Source
This commit is contained in:
CentOS Sources 2020-11-12 04:19:09 -05:00 committed by Andrew Lukoshko
parent 43c86f3d78
commit ac8694727b
10 changed files with 214 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eclipse.metadata
View File

@ -1,2 +1,2 @@
18fbcd1b7ea997edd0199d1ac54a68ad0ab71739 SOURCES/eclipse-platform-sources-4.15.tar.xz
cc4f1b206f1a5744884558b663b6064987a52a9c SOURCES/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz
d16ce0f61de3c9005e2cad8715d4518d99d4f1b0 SOURCES/eclipse-platform-sources-4.16.tar.xz
8af7a2c8c65958c39370e6ad00540331cbaac181 SOURCES/org.eclipse.linuxtools.eclipse-build-b056b40d26d052b788b790f27ead774ff804ab55.tar.xz

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/eclipse-platform-sources-4.15.tar.xz
SOURCES/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz
SOURCES/eclipse-platform-sources-4.16.tar.xz
SOURCES/org.eclipse.linuxtools.eclipse-build-b056b40d26d052b788b790f27ead774ff804ab55.tar.xz

2
SOURCES/0004-Add-parent-pom-for-old-tycho-pomless.patch
View File

@ -19,7 +19,7 @@ index 000000000..44a2f411b
+ <parent>
+ <artifactId>eclipse.platform.resources</artifactId>
+ <groupId>eclipse.platform.resources</groupId>
+ <version>4.15.0-SNAPSHOT</version>
+ <version>4.16.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <groupId>eclipse.platform.resources</groupId>

10
SOURCES/compiler-release.patch
View File

@ -1,10 +0,0 @@
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml.orig 2020-03-23 00:19:02.052686148 +0000
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml 2020-03-23 00:19:10.187688146 +0000
@@ -11,4 +11,7 @@
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
<version>1.3.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
</project>

39
SOURCES/eclipse-feature-plugins-to-category-ius.patch
View File

@ -185,32 +185,6 @@ index 57a58c6d5..a9c3e2c9b 100644
<plugin
id="org.eclipse.pde.api.tools"
download-size="0"
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
index abc2711c0..cada26023 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -120,7 +120,7 @@
<type>eclipse-plugin</type>
</dependency>
<dependency>
- <artifactId>javax.annotation</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
index 16a7a02dc..23ffa475a 100644
--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
@@ -119,7 +119,7 @@
<type>eclipse-plugin</type>
</dependency>
<dependency>
- <artifactId>javax.annotation</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
index 5b9e03021..1702d4dc6 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@ -220,7 +194,7 @@ index 5b9e03021..1702d4dc6 100644
<requirement>
<type>eclipse-plugin</type>
- <id>javax.annotation</id>
+ <id>javax.annotation-api</id>
+ <id>javax.annotation</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
@ -248,15 +222,6 @@ index 5b9e03021..1702d4dc6 100644
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
@@ -287,7 +287,7 @@
<type>eclipse-plugin</type>
</dependency>
<dependency>
- <artifactId>javax.annotation</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
index 79fa77d7e..5f3d6f6d0 100644
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@ -654,7 +619,7 @@ index 0ce4361be..ac28b73c2 100644
+ <import plugin="org.apache.batik.util" />
+ <import plugin="org.w3c.dom.svg" />
+ <import plugin="javax.inject" />
+ <import plugin="javax.annotation-api" />
+ <import plugin="javax.annotation" />
+ <import plugin="org.apache.batik.i18n" />
+ <import plugin="org.apache.batik.constants" />
+ <import plugin="org.apache.xmlgraphics" />

2
SOURCES/eclipse-fix-tests.patch
View File

@ -55,7 +55,7 @@ index bc8963d..fbe4da3 100644
@@ -28,3 +28,6 @@
src.includes = about.html
compilerArg=-proc:none
jars.extra.classpath = lib/java13api.jar
jars.extra.classpath = lib/java14api.jar
+source.lib/apttestprocessors.jar = processors/
+jars.compile.order = lib/apttestprocessors.jar,\
+ .

10
SOURCES/eclipse-p2-pick-up-renamed-jars.patch
View File

@ -1,8 +1,8 @@
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2018-04-25 15:35:44.914031196 +0100
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2018-04-25 15:36:17.546856697 +0100
@@ -884,7 +884,7 @@
//First check to see if there is already an IU around for this
IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2020-06-18 18:36:53.668369677 +0100
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2020-06-18 18:37:10.061182586 +0100
@@ -1010,7 +1010,7 @@
IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(),
PublisherHelper.fromOSGiVersion(bd.getVersion()));
IArtifactKey bundleArtKey = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
- if (bundleIU == null) {
+ if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {

2
SOURCES/explicit-hamcrest.patch
View File

@ -22,7 +22,7 @@
@@ -9,6 +9,7 @@
Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0",
org.eclipse.pde.ui.templates;bundle-version="3.6.0",
org.junit;bundle-version="4.12.0",
org.junit;bundle-version="4.13.0",
+ org.hamcrest.core;bundle-version="1.3.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.core.resources;bundle-version="3.12.0",

110
SOURCES/toolchains.xml Normal file
View File

@ -0,0 +1,110 @@
<toolchains>
<toolchain>
<type>jdk</type>
<provides>
<id>CDC-1.0/Foundation-1.0</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>CDC-1.1/Foundation-1.1</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>OSGi/Minimum-1.0</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>OSGi/Minimum-1.1</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>OSGi/Minimum-1.2</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>J2SE-1.4</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>J2SE-1.5</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>JavaSE-1.6</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>JavaSE-1.7</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>JavaSE-1.8</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-1.8.0</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<id>JavaSE-11</id>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-11</jdkHome>
</configuration>
</toolchain>
</toolchains>

139
SPECS/eclipse.spec
View File

@ -8,11 +8,11 @@
Epoch: 1
%global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8
%global eb_commit b056b40d26d052b788b790f27ead774ff804ab55
%global eclipse_rel %{version}
%global eclipse_tag R-%{eclipse_rel}-202003050155
%global eclipse_tag R-%{eclipse_rel}-202006040540
%global _jetty_version 9.4.27
%global _jetty_version 9.4.30
%global _lucene_version 8.4.1
%global _batik_version 1.11
@ -39,10 +39,17 @@ Epoch: 1
%global use_wayland 0
%endif
# Glassfish EE APIs that moved to jakarta namespace
%if 0%{?fedora}
%global _jakarta_annotations jakarta.annotation-api
%else
%global _jakarta_annotations javax.annotation-api
%endif
Summary: An open, extensible IDE
Name: eclipse
Version: 4.15
Release: 5%{?dist}
Version: 4.16
Release: 7%{?dist}
License: EPL-2.0
URL: http://www.eclipse.org/
@ -53,6 +60,9 @@ Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/ec
# %%{eb_commit} | xz > org.eclipse.linuxtools.eclipse-build-%%{eb_commit}.tar.xz
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
# Toolchain configurations for all EEs needed by Eclipse bundles
Source2: toolchains.xml
# Eclipse should not include source for dependencies that are not supplied by this package
# and should not include source for bundles that are not relevant to our platform
Patch0: eclipse-no-source-for-dependencies.patch
@ -82,7 +92,6 @@ Patch12: eclipse-fix-dropins.patch
# javax.el -> javax.el-api
# javax.servlet -> javax.servlet-api
# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
# javax.annotation -> javax.annotation-api
# org.w3c.dom.smil -> removed
Patch13: eclipse-feature-plugins-to-category-ius.patch
@ -119,8 +128,6 @@ Patch25: eclipse-patch-out-fileupload-dep.patch
# Force a clean on the restart after p2 operations
Patch26: force-clean-after-p2-operations.patch
Patch27: compiler-release.patch
# SCL-specific patches
Patch100: 0001-Avoid-limitation-with-older-shade-plug-in-versions-w.patch
Patch101: 0002-Allow-bootstrapping-against-OSGi-Core-R6.patch
@ -129,8 +136,9 @@ Patch102: 0004-Add-parent-pom-for-old-tycho-pomless.patch
# Upstream no longer supports non-64bit arches
ExclusiveArch: x86_64
# Build with Java 11
# Require both JDKs until Eclipse can fully move onto Java 11
BuildRequires: java-11-openjdk-devel
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: maven-local
BuildRequires: tycho
@ -194,8 +202,8 @@ BuildRequires: google-gson
BuildRequires: xmlgraphics-commons >= 2.3
BuildRequires: xml-commons-apis
BuildRequires: atinject
BuildRequires: eclipse-ecf-core >= 3.14.7
BuildRequires: eclipse-emf-core >= 1:2.21.0
BuildRequires: eclipse-ecf-core >= 3.14.8
BuildRequires: eclipse-emf-core >= 1:2.22.0
BuildRequires: eclipse-license2
BuildRequires: glassfish-annotation-api
BuildRequires: glassfish-el-api >= 3.0.1
@ -226,8 +234,6 @@ everything in between.
%package swt
Summary: SWT Library for GTK+
Requires: java-headless >= 1:1.8.0
Requires: javapackages-tools
Requires: gtk3
Requires: webkitgtk4
@ -236,8 +242,6 @@ SWT Library for GTK+.
%package equinox-osgi
Summary: Eclipse OSGi - Equinox
Requires: java-headless >= 1:1.8.0
Requires: javapackages-tools
Provides: osgi(system.bundle) = %{epoch}:%{version}
%description equinox-osgi
@ -245,6 +249,8 @@ Eclipse OSGi - Equinox
%package platform
Summary: Eclipse platform common files
Requires: java-11-openjdk-devel
Requires: javapackages-tools
Requires: ant >= 1.10.5
@ -267,15 +273,13 @@ Requires: lucene-core >= %{_lucene_version}
Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
Requires: sat4j
Requires: sac
Requires: batik-css >= %{_batik_version}
Requires: batik-util >= %{_batik_version}
Requires: xmlgraphics-commons >= 2.3
Requires: xml-commons-apis
Requires: atinject
Requires: eclipse-ecf-core >= 3.14.7
Requires: eclipse-emf-core >= 1:2.21.0
Requires: eclipse-ecf-core >= 3.14.8
Requires: eclipse-emf-core >= 1:2.22.0
Requires: glassfish-annotation-api
Requires: glassfish-el-api >= 3.0.1
Requires: glassfish-el >= 3.0.1
@ -287,7 +291,6 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
Requires: httpcomponents-client
Requires: osgi(org.tukaani.xz)
# Obsoletes added in F31
Obsoletes: eclipse-epp-logging <= 2.0.8-4
@ -303,6 +306,7 @@ BuildArch: noarch
Provides: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: java-11-openjdk-src
Requires: junit >= 4.12
Requires: junit5 >= 5.4.0
Requires: osgi(org.hamcrest.core)
@ -361,7 +365,7 @@ tar --strip-components=1 -xf %{SOURCE0}
tar --strip-components=1 -xf %{SOURCE1}
# Delete pre-built binary artifacts except some test data that cannot be generated
find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "java13api.jar" ! -name "j9stubs.jar" ! -name "annotations.jar" \
find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java14api.jar" ! -name "j9stubs.jar" ! -name "annotations.jar" \
-type f -name *.jar -delete
find . -type f -name *.class -delete
find . -type f -name *.so -delete
@ -394,7 +398,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch24 -p1
%patch25
%patch26 -p1
%patch27
# SCL-specific patches
%patch100 -p1
@ -447,15 +450,20 @@ sed -i -e '/jgit.dirtyWorkingTree>/a<strictSrcIncludes>false</strictSrcIncludes>
# Don't need annotations for obsolete JDKs
%pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
%pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' \
eclipse.jdt.core/org.eclipse.jdt.core.tests.{model,builder,compiler}/META-INF/MANIFEST.MF \
eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF \
eclipse.jdt.ui/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF
sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom.xml \
eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
%pom_xpath_remove "plugin[@version='1.1.500.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
# javax.annotation -> jakarta.annotation-api
sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' eclipse-platform-parent/pom.xml \
eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml \
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
# Fix requirement on junit 4
sed -i -e 's/4.13.0,5.0.0/4.12.0,5.0.0/' eclipse.jdt.ui/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java
# Disable examples
%pom_disable_module infocenter-web eclipse.platform.ua
%pom_disable_module examples rt.equinox.p2
%pom_disable_module examples eclipse.platform.ui
%pom_disable_module org.eclipse.debug.examples.core eclipse.platform.debug
@ -469,6 +477,7 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom
%pom_disable_module examples/org.eclipse.compare.examples.xml eclipse.platform.team
%pom_disable_module examples/org.eclipse.team.examples.filesystem eclipse.platform.team
%pom_disable_module org.eclipse.jface.text.examples eclipse.platform.text
%pom_disable_module org.eclipse.ui.examples.javaeditor eclipse.platform.text
%pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text
%pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua
%pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua
@ -549,6 +558,7 @@ done
%pom_disable_module org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui/bundles
%pom_disable_module org.eclipse.ui.cocoa eclipse.platform.ui/bundles
%pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles
%pom_disable_module org.eclipse.e4.ui.swt.win32 eclipse.platform.ui/bundles
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
@ -586,9 +596,6 @@ sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.bat
sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
# Include maven descriptors to allow our test execution setup to work
%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
# Don't set perms on files for platforms that aren't linux
for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
@ -625,6 +632,13 @@ sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox
# Pre-compiling JSPs does not currently work
%pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
# Make maven output less noisy due to lack of intenet connection
sed -i -e '/baselineMode/s/warn/disable/' eclipse-platform-parent/pom.xml
# Remove release parameter not needed when using BREE libs
sed -i -e '/maven.compiler.release/d' \
eclipse.jdt.debug/org.eclipse.jdt.debug/pom.xml eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
# Use system osgi.annotation lib
ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
@ -633,9 +647,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
# Allow library detector to build on Java 11
sed -i -e 's/target="1.1" source="1.3"/target="1.6" source="1.6"/' eclipse.jdt.debug/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml
# The order of these mvn_package calls is important
%mvn_package "::pom::" __noinstall
%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools
@ -667,23 +678,29 @@ export M_ARCH="$LDFLAGS"
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
export JAVA_HOME=%{_jvmdir}/java
export JAVA_HOME=%{_jvmdir}/java-11
# TODO: Fix bug in the tycho installation
xmvn -o install:install-file -Dtycho.mode=maven -Dfile=%{_javadir}/tycho/tycho-lib-detector.jar -DpomFile=%{_mavenpomdir}/tycho/tycho-lib-detector.pom
# Pre-build agent jar needed for AdvancedSourceLookupSupport
sed -i -e '/createSourcesJar/d' -e 's/7\.2/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml
sed -i -e 's/V14/V11/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java
sed -i -e '/createSourcesJar/d' -e 's/8\.0\.1/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml
sed -i -e 's/V15/V11/' -e 's/ASM8/ASM7/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java \
eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
(cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -e -o -B clean verify)
mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \
eclipse.jdt.debug/org.eclipse.jdt.launching/lib
# Qualifier generated from last modification time of source tarball
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
%mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER \
%mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER -DaggregatorBuild=true -Dbuild.compiler="extJavac" \
%if %{with bootstrap}
-P !api-generation,!build-docs \
-Pbree-libs,!api-generation,!build-docs \
%else
-Pbree-libs \
%endif
-Declipse.javadoc=%{_jvmdir}/java/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget \
-Declipse.javadoc=%{_jvmdir}/java-11/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget --global-toolchains %{SOURCE2} \
-Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X
# Location that the product is materialised
@ -720,16 +737,11 @@ popd
sed -i "s|-Xms40m|-Xms512m|g" eclipse.ini
sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
sed -i '1i-protect\nroot' eclipse.ini
sed -i '/-vmargs/i-vm\n%{_jvmdir}/java-11/bin/java' eclipse.ini
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini <<EOF
-Dorg.eclipse.swt.browser.UseWebKitGTK=true
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
-Declipse.p2.skipMovedInstallDetection=true
@ -739,7 +751,6 @@ EOF
popd #eclipse
%install
export JAVA_HOME=%{_jvmdir}/java-11
%mvn_install
# Some directories we need
@ -887,6 +898,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/com.jcraft.jsch_*
%{_eclipsedir}/plugins/com.sun.el.javax.el_*
%{_eclipsedir}/plugins/javax.*
%if 0%{?fedora}
%{_eclipsedir}/plugins/jakarta.*
%endif
%{_eclipsedir}/plugins/org.apache.*
%{_eclipsedir}/plugins/org.eclipse.ant.core_*
%{_eclipsedir}/plugins/org.eclipse.compare_*
@ -989,6 +1003,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.jface_*
%{_eclipsedir}/plugins/org.eclipse.jface.databinding_*
%{_eclipsedir}/plugins/org.eclipse.jface.text_*
%{_eclipsedir}/plugins/org.eclipse.jface.notifications_*
%{_eclipsedir}/plugins/org.eclipse.jsch.core_*
%{_eclipsedir}/plugins/org.eclipse.jsch.ui_*
%{_eclipsedir}/plugins/org.eclipse.ltk.core.refactoring_*
@ -1059,6 +1074,32 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Fri Oct 23 2020 Alexander Kurtakov <akurtako@redhat.com> 1:4.16-8
- Add java-11-openjdk-devel - without it /usr/lib/jvm/java-11 is not created.
* Thu Oct 22 2020 Alexander Kurtakov <akurtako@redhat.com> 1:4.16-7
- Add additonal Java 11 dependencies to ensure all parts are installed.
* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-6
- Require Java 11 explicitly
- Drop hotspot exclusions from the JDK 6 era
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:4.16-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Mon Jun 29 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-4
- Update linux-build snapshot and fix adding junit classpath containers to java
projects
* Tue Jun 23 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-3
- Make a bit more portable and fix bootstrap mode
* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-2
- Non-bootstrap build
* Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-1
- Update to latest upstream release
* Thu Apr 02 2020 Mat Booth <mat.booth@redhat.com> - 1:4.15-5
- Make the requirement on felix-scr more strict