Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/eclipse-emf.git#1eefe16f534e9be004f90c0f58ff0e5cad8d487d

eclipse-emf.spec

@@ -1,7 +1,7 @@
 %global _eclipsedir %{_prefix}/lib/eclipse
 
-%global emf_tag R2_24_0
-%global xsd_tag R2_24_0
+%global emf_tag ddba8b9fe0208481dc3d73ccc692d5c346ea6bae
+%global xsd_tag 2853b57a053beff82e8160c5827d7d92c7aff3f8
 
 # Set this flag to avoid building everything except for the core bundles
 # Allows building into a brand new buildroot before Eclipse is even built
@@ -9,8 +9,8 @@
 
 Epoch:     1
 Name:      eclipse-emf
-Version:   2.24.0
-Release:   2%{?dist}
+Version:   2.25.0
+Release:   1%{?dist}
 Summary:   EMF and XSD Eclipse plug-ins
 
 License:   EPL-2.0
@@ -24,7 +24,6 @@ Patch0:    0001-Remove-dependency-on-nebula.patch
 Patch1:    0002-Remove-test-that-requires-talking-to-the-internet.patch
 
 BuildRequires: tycho
-BuildRequires: tycho-extras
 %if %{without bootstrap}
 BuildRequires: eclipse-pde
 %endif
@@ -103,6 +102,9 @@ sed -i -e '/<module>.*examples/d' releng/org.eclipse.emf.parent/plugins/pom.xml
 %pom_disable_module "../org.eclipse.emf.site" releng/org.eclipse.emf.parent
 %pom_disable_module '../../../features/org.eclipse.emf.all-feature' releng/org.eclipse.emf.parent/features
 
+# Disable test modules
+sed -i -e '/\/tests\//d' releng/org.eclipse.emf.parent/{features,plugins}/pom.xml
+
 # Disable jgit/target platform stuff that we can't use in RPM builds
 %pom_remove_plugin :target-platform-configuration releng/org.eclipse.emf.parent
 %pom_remove_dep :tycho-sourceref-jgit releng/org.eclipse.emf.parent
@@ -135,10 +137,6 @@ popd
 %mvn_package ":org.eclipse.{emf,xsd}.license" __noinstall
 %mvn_package ":org.eclipse.emf.base" __noinstall
 
-# No need to ship tests as they are run at buildtime
-%mvn_package ":org.eclipse.emf.tests" __noinstall
-%mvn_package ":org.eclipse.emf.test.*" __noinstall
-
 # Don't install SDK features
 %mvn_package ":::{sources,sources-feature}:" __noinstall
 %mvn_package ":org.eclipse.emf.{sdk,doc,cheatsheets,example.installer}" __noinstall
@@ -153,8 +151,8 @@ popd
 %build
 # 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 org.eclipse.emf/pom.xml -DforceContextQualifier=$QUALIFIER -Dmaven.test.failure.ignore=true \
-  -Dtarget-platform=2020-09
+%mvn_build -f -j -- -f org.eclipse.emf/pom.xml -DforceContextQualifier=$QUALIFIER \
+  -Dtarget-platform=2021-03
 
 %install
 %mvn_install
@@ -186,6 +184,9 @@ done
 %endif
 
 %changelog
+* Wed Mar 10 2021 Mat Booth <mat.booth@redhat.com> - 1:2.25.0-1
+- Update to latest upstream release
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (org.eclipse.emf-R2_24_0.tar.xz) = a5db856a926923d1f95196594d1cce53c655db9fe61055e6eb7920754e3877de5fa78079d15e0ae90bf9b3391e3cba44fb5be4b9292682724d961600c1a392f1
-SHA512 (org.eclipse.xsd-R2_24_0.tar.xz) = da47f36e43f45f0aff92a148109d2896d648bcaa1b4524613d04b8b6bb38bccaa7055a1d639a30bebd7843b4c6e545810b192e73d8c42548cdd9ff132c58f33b
+SHA512 (org.eclipse.emf-ddba8b9fe0208481dc3d73ccc692d5c346ea6bae.tar.xz) = b83150c7d386ab8ab2d9289b074a6c45f6342aa58805a637ae7e50a0c631a661868922ede75a465441585be78e80efe6d16f92ba26cfa3261ab7210dc7d5e1b4
+SHA512 (org.eclipse.xsd-2853b57a053beff82e8160c5827d7d92c7aff3f8.tar.xz) = 46334ea03d580b2a4a0932dade373cfb3578ec6391c3eb3e6b15ba7b130c997959db3b16db6f93daa8cb0e09f8f2d67844ae670196a77013992de04cd9fe47dd