开源软件构建与测试

_service:tar_scm:eclipse-emf.spec Changed

@@ -1,19 +1,17 @@
 %global _eclipsedir %{_prefix}/lib/eclipse
-%global emf_tag 666f438f84c97358ce33fd4c1f615212cdd419f9
-%global xsd_tag a5f53126aa28435e3f44bde6700372c8559127de
+%global emf_tag R2_32_0
+%global xsd_tag XSD_R2_32_0
 %bcond_with bootstrap
 Name:                eclipse-emf
-Version:             2.16.0
+Version:             2.32.0
 Release:             1
 Summary:             EMF and XSD Eclipse plug-ins
 License:             EPL-2.0
 URL:                 http://www.eclipse.org/modeling/emf/
 Source0:             http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{emf_tag}.tar.gz
-Source1:             http://git.eclipse.org/c/xsd/org.eclipse.xsd.git/snapshot/org.eclipse.xsd-%{xsd_tag}.tar.gz
-Patch0:              remove-nebula-dep.patch
-Patch1:              remove-network-tests.patch
-Patch2:              remove-timezone-test.patch
-Patch3:              remove-unnecessary-imports.patch
+Source1:             http://git.eclipse.org/c/xsd/org.eclipse.xsd.git/snapshot/org.eclipse.emf-%{xsd_tag}.tar.gz
+Patch0:              0001-Remove-dependency-on-nebula.patch
+Patch1:              0002-Remove-test-that-requires-talking-to-the-internet.patch
 BuildRequires:       tycho tycho-extras
 %if %{without bootstrap}
 BuildRequires:       eclipse-pde
@@ -64,12 +62,11 @@
 %prep
 %setup -c -T -q -a 0 -a 1
 mv org.eclipse.emf-%{emf_tag}/ org.eclipse.emf/
-mv org.eclipse.xsd-%{xsd_tag}/ org.eclipse.xsd/
-%patch0
-%patch1
-%patch2
-%patch3
+mv org.eclipse.emf-%{xsd_tag}/ org.eclipse.xsd/
+%patch0 -p1
+%patch1 -p1
 pushd org.eclipse.emf
+%pom_remove_plugin ":maven-toolchains-plugin" releng/org.eclipse.emf.parent
 sed -i -e '/org.eclipse.emf.gwt/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
 sed -i -e '/org.eclipse.emf.oda/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
 sed -i -e '/org.eclipse.emf.rap/d' releng/org.eclipse.emf.parent/{plugins,features}/pom.xml
@@ -125,7 +122,7 @@
 
 %build
 QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
-%mvn_build -j -- -f org.eclipse.emf/pom.xml -DforceContextQualifier=$QUALIFIER -Dmaven.test.failure.ignore=true
+%mvn_build -j -- -f org.eclipse.emf/pom.xml -DforceContextQualifier=$QUALIFIER -Dtarget-platform=2021-03 -Dmaven.test.failure.ignore=true
 
 %install
 %mvn_install
@@ -153,5 +150,8 @@
 %endif
 
 %changelog
+* Fri Jun 28 2024 yaoxin <yao_xin001@hoperun.com> - 2.32.0-1
+- Upgrade to 2.32.0
+
 * Thu Aug 27 2020 yanan li <liyanan032@huawei.com> - 2.16.0-1
 - Package init

_service:tar_scm:0001-Remove-dependency-on-nebula.patch Added

@@ -0,0 +1,26 @@
+From 079a94e149165b30af36d13cfc8f37b5f854881f Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 20 Mar 2020 13:53:25 +0000
+Subject: PATCH 1/2 Remove dependency on nebula
+
+---
+ plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
+index a1eda52..962ecd2 100644
+--- a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
++++ b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
+@@ -22,8 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0,4.0.0)",
+  org.eclipse.emf.common.ui;bundle-version="2.20.0,3.0.0)";visibility:=reexport,
+  org.eclipse.core.resources;bundle-version="3.6.0,4.0.0)";resolution:=optional,
+  org.eclipse.ui.ide;bundle-version="3.6.0,4.0.0)";resolution:=optional,
+- org.eclipse.jface.text;bundle-version="3.6.0,4.0.0)";resolution:=optional,
+- org.eclipse.nebula.widgets.cdatetime;bundle-version="1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy
++ org.eclipse.jface.text;bundle-version="3.6.0,4.0.0)";resolution:=optional
+ Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
+ Automatic-Module-Name: org.eclipse.emf.edit.ui
+-- 
+2.44.0
+

_service:tar_scm:0002-Remove-test-that-requires-talking-to-the-internet.patch Added

@@ -0,0 +1,28 @@
+From 25b039d588bc77b8f70d74ddacb6b7ad570c95e6 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 20 Mar 2020 13:53:59 +0000
+Subject: PATCH 2/2 Remove test that requires talking to the internet
+
+---
+ .../org/eclipse/emf/test/core/ecore/URIConverterTest.java    | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
+index 392faed..fbc465c 100644
+--- a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
++++ b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java
+@@ -77,11 +77,6 @@ public class URIConverterTest
+     assertEquals(contentsFromUncompressedFile, contents);
+     new File(URI.createURI(uri.authority().replace("!", "")).toFileString()).delete();
+ 
+-    // Reads the data.zip file from our git repository using https
+-    //
+-    uri = URI.createURI("archive:https://git.eclipse.org/c/emf/org.eclipse.emf.git/plain/tests/org.eclipse.emf.test.core/data/data.zip!/%66ile.txt");
+-    contents = readFile(uriConverter.createInputStream(uri));
+-    assertEquals(contentsFromUncompressedFile, contents);
+   }
+ 
+   protected String readFile(InputStream inputStream) throws IOException
+-- 
+2.44.0
+

_service:tar_scm:remove-nebula-dep.patch Deleted

_service:tar_scm:remove-network-tests.patch Deleted

_service:tar_scm:remove-timezone-test.patch Deleted

_service:tar_scm:remove-unnecessary-imports.patch Deleted

@@ -1,32 +0,0 @@
---- org.eclipse.emf/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF.orig	2018-05-10 16:02:28.482659996 +0100
-+++ org.eclipse.emf/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF	2018-05-10 16:13:55.087669818 +0100
-@@ -26,12 +26,7 @@
-  org.eclipse.core.resources;bundle-version="3.6.0,4.0.0)";resolution:=optional
- Import-Package: javax.crypto,
-  javax.crypto.spec,
-- javax.xml.datatype,
-- javax.xml.namespace,
-- javax.xml.parsers,
-- org.osgi.framework;version="1.5.0,2.0.0)",
-- org.xml.sax,
-- org.xml.sax.helpers
-+ org.osgi.framework;version="1.5.0,2.0.0)"
- Eclipse-BuddyPolicy: dependent
- Eclipse-LazyStart: true
- Bundle-ActivationPolicy: lazy
---- org.eclipse.emf/plugins/org.eclipse.emf.ecore.xmi/META-INF/MANIFEST.MF.orig	2018-05-10 16:03:20.826431277 +0100
-+++ org.eclipse.emf/plugins/org.eclipse.emf.ecore.xmi/META-INF/MANIFEST.MF	2018-05-10 16:13:18.912825246 +0100
-@@ -14,12 +14,6 @@
- Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
-  org.eclipse.emf.ecore;bundle-version="2.15.0,3.0.0)";visibility:=reexport
- Eclipse-LazyStart: true
--Import-Package: javax.xml.namespace,
-- javax.xml.parsers,
-- org.osgi.framework;version="1.5.0,2.0.0)",
-- org.w3c.dom,
-- org.xml.sax,
-- org.xml.sax.ext,
-- org.xml.sax.helpers
-+Import-Package: org.osgi.framework;version="1.5.0,2.0.0)"
- Bundle-ActivationPolicy: lazy
- Automatic-Module-Name: org.eclipse.emf.ecore.xmi

_service Changed

_service:tar_scm:org.eclipse.emf-666f438f84c97358ce33fd4c1f615212cdd419f9.tar.gz Deleted

_service:tar_scm:org.eclipse.emf-R2_32_0.tar.gz Added

_service:tar_scm:org.eclipse.emf-XSD_R2_32_0.tar.gz Added

_service:tar_scm:org.eclipse.xsd-a5f53126aa28435e3f44bde6700372c8559127de.tar.gz Deleted

Changes of Revision 2