!22 fix build error
From: @chen-jan Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot
Gitee
commit
bd4085ea04
@ -0,0 +1,50 @@
|
|||||||
|
From 7955cc64a07f38c57f45c9ce79d53031c4502c23 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sravan Kumar Lakkimsetti
|
||||||
|
Date: Wed, 28 Apr 2021 12:23:23 +0530
|
||||||
|
Subject: Bug 573206 - I20210428-0040 - BUILD FAILED with compilation failure
|
||||||
|
in org.eclipse.test
|
||||||
|
|
||||||
|
Update to Ant 1.10.10
|
||||||
|
|
||||||
|
Change-Id: I5273072f05d1080b2df61e8c839b4292d1b63c48
|
||||||
|
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
|
||||||
|
Reviewed-on:https://git.eclipse.org/r/c/platform/eclipse.platform.releng/+/179905
|
||||||
|
---
|
||||||
|
.../src/org/eclipse/test/LegacyXmlResultFormatter.java | 9 ++++++++-
|
||||||
|
1 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
index e7011aae4..99676ef77 100644
|
||||||
|
--- eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
+++ eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*******************************************************************************
|
||||||
|
- * Copyright (c) 2018 Red Hat Inc. and others.
|
||||||
|
+ * Copyright (c) 2021 Red Hat Inc. and others.
|
||||||
|
*
|
||||||
|
* This program and the accompanying materials
|
||||||
|
* are made available under the terms of the Eclipse Public License 2.0
|
||||||
|
@@ -64,6 +64,8 @@ public class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter {
|
||||||
|
final AtomicLong numTestsSkipped = new AtomicLong(0);
|
||||||
|
final AtomicLong numTestsAborted = new AtomicLong(0);
|
||||||
|
|
||||||
|
+ private boolean useLegacyReportingName = false;
|
||||||
|
+
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void testPlanExecutionStarted(final TestPlan plan) {
|
||||||
|
@@ -156,6 +158,11 @@ public class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter {
|
||||||
|
this.startedAt = startedAt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ @Override
|
||||||
|
+ public void setUseLegacyReportingName(final boolean useLegacyReportingName) {
|
||||||
|
+ this.useLegacyReportingName = useLegacyReportingName;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
|
||||||
|
private final class XMLReportWriter {
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
24
Remove-ECF-httpclient-dependency-from-p2-test.patch
Normal file
24
Remove-ECF-httpclient-dependency-from-p2-test.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From 6b90739751219a4e0d6ef7d2ceba9ec564284c7e Mon Sep 17 00:00:00 2001
|
||||||
|
From: chen-jan <chen_aka_jan@163.com>
|
||||||
|
Date: Thu, 5 May 2022 08:48:14 +0000
|
||||||
|
Subject: [PATCH] Remove ECF httpclient dependency from p2 test
|
||||||
|
|
||||||
|
---
|
||||||
|
bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
|
||||||
|
index 761be42..0b80dee 100644
|
||||||
|
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
|
||||||
|
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
|
||||||
|
@@ -46,7 +46,6 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
|
||||||
|
org.eclipse.ecf.filetransfer;bundle-version="4.0.0",
|
||||||
|
org.eclipse.ecf.identity;bundle-version="3.1.0",
|
||||||
|
org.eclipse.ecf.provider.filetransfer;bundle-version="3.1.0",
|
||||||
|
- org.eclipse.ecf.provider.filetransfer.httpclient4,
|
||||||
|
org.eclipse.equinox.p2.reconciler.dropins;bundle-version="1.1.0",
|
||||||
|
org.eclipse.ant.core;bundle-version="3.2.200",
|
||||||
|
org.apache.ant;bundle-version="1.7.1",
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
16
eclipse.spec
16
eclipse.spec
@ -11,7 +11,7 @@
|
|||||||
Name: eclipse
|
Name: eclipse
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.11
|
Version: 4.11
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
License: EPL-2.0
|
License: EPL-2.0
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -36,6 +36,12 @@ Patch28: prefer_x11_backend.patch
|
|||||||
Patch29: fix_ant_build.patch
|
Patch29: fix_ant_build.patch
|
||||||
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
||||||
Patch31: org-eclipse-swt.patch
|
Patch31: org-eclipse-swt.patch
|
||||||
|
#Patch from: https://git.eclipse.org/c/equinox/rt.equinox.p2.git/commit/?id=6759b665ff36357961de840b8239ce6fbffaa75c
|
||||||
|
Patch32: switch-to-the-new-httpclient45-ECF-provider.patch
|
||||||
|
#Patch from: https://git.eclipse.org/c/equinox/rt.equinox.p2.git/commit/?id=c2719b94e074e8d43cb95ae7d7d4bc1fb4b43b56
|
||||||
|
Patch33: Remove-ECF-httpclient-dependency-from-p2-test.patch
|
||||||
|
#Patch from: https://git.eclipse.org/r/plugins/gitiles/platform/eclipse.platform.releng/+/3b93e4149e92a4d567a2c040c6953311b9fdb135
|
||||||
|
Patch34: BUILD-FAILED-with-compilation-failure-in-org-eclipse-test.patch
|
||||||
ExcludeArch: s390 %{arm} %{ix86}
|
ExcludeArch: s390 %{arm} %{ix86}
|
||||||
BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
|
BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
|
||||||
BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
|
BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
|
||||||
@ -203,6 +209,9 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
|
|||||||
%patch29
|
%patch29
|
||||||
%patch30 -p1
|
%patch30 -p1
|
||||||
%patch31
|
%patch31
|
||||||
|
%patch32
|
||||||
|
%patch33
|
||||||
|
%patch34
|
||||||
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
|
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
|
||||||
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
|
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
|
||||||
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
|
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
|
||||||
@ -745,6 +754,11 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
|
|||||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 06 2022 chenchen <chen_aka_jan@163.com> - 1:4.11-4
|
||||||
|
- switch to the new httpclient45 ECF provider
|
||||||
|
- remove ECF httpclient dependency from p2 test
|
||||||
|
- build failed with compilation failure in org.eclipse.test
|
||||||
|
|
||||||
* Sat Jul 31 2021 liping<liping136@huawei.com> - 1:4.11-3
|
* Sat Jul 31 2021 liping<liping136@huawei.com> - 1:4.11-3
|
||||||
- fix by upgrade to GCC-10
|
- fix by upgrade to GCC-10
|
||||||
|
|
||||||
|
|||||||
41
switch-to-the-new-httpclient45-ECF-provider.patch
Normal file
41
switch-to-the-new-httpclient45-ECF-provider.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
From 7dadb0a63f838090a0709e95ec078a8c98351c81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: chen-jan <chen_aka_jan@163.com>
|
||||||
|
Date: Thu, 5 May 2022 08:36:15 +0000
|
||||||
|
Subject: [PATCH] switch to the new httpclient45 ECF provider
|
||||||
|
|
||||||
|
---
|
||||||
|
.../features/org.eclipse.equinox.p2.core.feature/feature.xml | 3 +--
|
||||||
|
rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml | 3 +--
|
||||||
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
|
||||||
|
index dafa30bbf..65d5571b7 100644
|
||||||
|
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
|
||||||
|
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
|
||||||
|
@@ -17,8 +17,7 @@
|
||||||
|
<import feature="org.eclipse.ecf.core.feature" version="1.4.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.core.ssl.feature" version="1.1.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.filetransfer.feature" version="3.13.7" match="compatible"/>
|
||||||
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.13.7" match="compatible"/>
|
||||||
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.1.0" match="compatible"/>
|
||||||
|
+ <import feature="org.eclipse.ecf.filetransfer.httpclient45.feature" version="1.0.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.0" match="compatible"/>
|
||||||
|
</requires>
|
||||||
|
|
||||||
|
diff --git rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml
|
||||||
|
index 52c3aed8a..0e8c6b235 100644
|
||||||
|
--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml
|
||||||
|
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml
|
||||||
|
@@ -31,8 +31,7 @@
|
||||||
|
<import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||||
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||||
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
|
+ <import feature="org.eclipse.ecf.filetransfer.httpclient45.feature.source" version="1.0.0" match="compatible"/>
|
||||||
|
<import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
|
</requires>
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user