From 5500f96afb038ac5c05a295fe9f6a7ab334d6d34 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 2 May 2022 18:05:01 +0200
Subject: [PATCH] Build with Tycho 2.7.2 (#657)

---
 .mvn/extensions.xml                               |  2 +-
 org.eclipse.m2e.core/META-INF/MANIFEST.MF         |  1 -
 org.eclipse.m2e.core/OSGI-INF/.gitignore          |  1 +
 ...clipse.m2e.core.embedder.MavenModelManager.xml |  9 ---------
 ...lipse.m2e.core.internal.embedder.MavenImpl.xml |  9 ---------
 ...nternal.index.filter.ArtifactFilterManager.xml |  7 -------
 ...re.internal.launch.MavenRuntimeManagerImpl.xml |  8 --------
 ...e.core.internal.markers.MavenMarkerManager.xml |  8 --------
 ...nternal.preferences.MavenConfigurationImpl.xml |  9 ---------
 ...ternal.project.ProjectConfigurationManager.xml | 15 ---------------
 ...project.WorkspaceClassifierResolverManager.xml |  7 -------
 ...core.internal.project.WorkspaceStateWriter.xml |  9 ---------
 ...roject.conversion.ProjectConversionManager.xml |  7 -------
 ...ernal.project.registry.MavenProjectManager.xml | 12 ------------
 ...oject.registry.ProjectFacadeAdapterFactory.xml | 10 ----------
 ...al.project.registry.ProjectRegistryManager.xml | 13 -------------
 ...nal.project.registry.ProjectRegistryReader.xml |  7 -------
 ...project.registry.ProjectRegistryRefreshJob.xml | 11 -----------
 ...ore.internal.repository.RepositoryRegistry.xml | 11 -----------
 pom.xml                                           |  2 +-
 setup/tychoSnapshotSettings.xml                   |  2 +-
 21 files changed, 4 insertions(+), 156 deletions(-)
 create mode 100644 org.eclipse.m2e.core/OSGI-INF/.gitignore
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.embedder.MavenModelManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.embedder.MavenImpl.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.markers.MavenMarkerManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.ProjectConfigurationManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceStateWriter.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.MavenProjectManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob.xml
 delete mode 100644 org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.repository.RepositoryRegistry.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 088ea0ead9..be0a44140c 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </extension>
 </extensions>
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 030e8d9516..18734fa1ac 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -47,7 +47,6 @@ Export-Package: org.eclipse.m2e.core,
 MavenArtifact-GroupId: org.eclipse.m2e
 MavenArtifact-ArtifactId: org.eclipse.m2e.core
 Import-Package: javax.inject;version="1.0.0",
- org.osgi.service.component.annotations;version="1.3.0",
  org.slf4j;version="1.6.2"
 Automatic-Module-Name: org.eclipse.m2e.core
 Service-Component: OSGI-INF/org.eclipse.m2e.core.embedder.MavenModelManager.xml,
diff --git a/org.eclipse.m2e.core/OSGI-INF/.gitignore b/org.eclipse.m2e.core/OSGI-INF/.gitignore
new file mode 100644
index 0000000000..24a7dd2c26
--- /dev/null
+++ b/org.eclipse.m2e.core/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.m2e.*.xml
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.embedder.MavenModelManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.embedder.MavenModelManager.xml
deleted file mode 100644
index b4c25f46eb..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.embedder.MavenModelManager.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.embedder.MavenModelManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.embedder.MavenModelManager"/>
-   </service>
-   <reference cardinality="1..1" field="maven" interface="org.eclipse.m2e.core.embedder.IMaven" name="maven"/>
-   <reference cardinality="1..1" field="projectManager" interface="org.eclipse.m2e.core.project.IMavenProjectRegistry" name="projectManager"/>
-   <implementation class="org.eclipse.m2e.core.embedder.MavenModelManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.embedder.MavenImpl.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.embedder.MavenImpl.xml
deleted file mode 100644
index 5bc5092a10..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.embedder.MavenImpl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" deactivate="disposeContainer" name="org.eclipse.m2e.core.internal.embedder.MavenImpl">
-   <service>
-      <provide interface="org.eclipse.m2e.core.embedder.IMaven"/>
-      <provide interface="org.eclipse.m2e.core.embedder.IMavenConfigurationChangeListener"/>
-   </service>
-   <reference cardinality="1..1" field="mavenConfiguration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="mavenConfiguration"/>
-   <implementation class="org.eclipse.m2e.core.internal.embedder.MavenImpl"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager.xml
deleted file mode 100644
index 83b4891f0f..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager"/>
-   </service>
-   <implementation class="org.eclipse.m2e.core.internal.index.filter.ArtifactFilterManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl.xml
deleted file mode 100644
index 787e915208..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl">
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl"/>
-   </service>
-   <reference cardinality="1..1" field="preferenceStore" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="preferenceStore"/>
-   <implementation class="org.eclipse.m2e.core.internal.launch.MavenRuntimeManagerImpl"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.markers.MavenMarkerManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.markers.MavenMarkerManager.xml
deleted file mode 100644
index ab62a60cd1..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.markers.MavenMarkerManager.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.internal.markers.MavenMarkerManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.markers.IMavenMarkerManager"/>
-   </service>
-   <reference cardinality="1..1" field="mavenConfiguration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="mavenConfiguration"/>
-   <implementation class="org.eclipse.m2e.core.internal.markers.MavenMarkerManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl.xml
deleted file mode 100644
index 197264fc58..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="init" name="org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl">
-   <service>
-      <provide interface="org.eclipse.m2e.core.embedder.IMavenConfiguration"/>
-   </service>
-   <reference bind="addConfigurationChangeListener" cardinality="0..n" interface="org.eclipse.m2e.core.embedder.IMavenConfigurationChangeListener" name="ConfigurationChangeListener" policy="dynamic" unbind="removeConfigurationChangeListener"/>
-   <reference cardinality="1..1" field="preferenceStore" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="preferenceStore"/>
-   <implementation class="org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.ProjectConfigurationManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.ProjectConfigurationManager.xml
deleted file mode 100644
index abeb0ac9be..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.ProjectConfigurationManager.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.internal.project.ProjectConfigurationManager">
-   <property name="event.mask" type="Integer" value="4"/>
-   <service>
-      <provide interface="org.eclipse.m2e.core.project.IProjectConfigurationManager"/>
-      <provide interface="org.eclipse.m2e.core.project.IMavenProjectChangedListener"/>
-      <provide interface="org.eclipse.core.resources.IResourceChangeListener"/>
-   </service>
-   <reference cardinality="1..1" field="maven" interface="org.eclipse.m2e.core.embedder.IMaven" name="maven"/>
-   <reference cardinality="1..1" field="mavenConfiguration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="mavenConfiguration"/>
-   <reference cardinality="1..1" field="mavenMarkerManager" interface="org.eclipse.m2e.core.internal.markers.IMavenMarkerManager" name="mavenMarkerManager"/>
-   <reference cardinality="1..1" field="mavenModelManager" interface="org.eclipse.m2e.core.embedder.MavenModelManager" name="mavenModelManager"/>
-   <reference cardinality="1..1" field="projectManager" interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager" name="projectManager"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.ProjectConfigurationManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager.xml
deleted file mode 100644
index ca486176d2..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.project.IWorkspaceClassifierResolverManager"/>
-   </service>
-   <implementation class="org.eclipse.m2e.core.internal.project.WorkspaceClassifierResolverManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceStateWriter.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceStateWriter.xml
deleted file mode 100644
index c6250e37c6..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.WorkspaceStateWriter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.internal.project.WorkspaceStateWriter">
-   <service>
-      <provide interface="org.eclipse.m2e.core.project.IMavenProjectChangedListener"/>
-   </service>
-   <reference cardinality="1..1" field="projectManager" interface="org.eclipse.m2e.core.internal.project.registry.MavenProjectManager" name="projectManager"/>
-   <reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.WorkspaceStateWriter"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager.xml
deleted file mode 100644
index 591bdf6df1..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.project.conversion.IProjectConversionManager"/>
-   </service>
-   <implementation class="org.eclipse.m2e.core.internal.project.conversion.ProjectConversionManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.MavenProjectManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.MavenProjectManager.xml
deleted file mode 100644
index e56ddb69d8..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.MavenProjectManager.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="init" name="org.eclipse.m2e.core.internal.project.registry.MavenProjectManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.project.IMavenProjectRegistry"/>
-   </service>
-   <reference bind="addMavenProjectChangedListener" cardinality="0..n" interface="org.eclipse.m2e.core.project.IMavenProjectChangedListener" name="MavenProjectChangedListener" policy="dynamic" unbind="removeMavenProjectChangedListener"/>
-   <reference cardinality="1..1" field="configuration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="configuration"/>
-   <reference cardinality="1..1" field="manager" interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager" name="manager"/>
-   <reference cardinality="1..1" field="mavenBackgroundJob" interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob" name="mavenBackgroundJob"/>
-   <reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.registry.MavenProjectManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory.xml
deleted file mode 100644
index 2d5aa850e7..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory">
-   <property name="adaptableClass" value="org.eclipse.core.resources.IResource"/>
-   <property name="adapterNames" value="org.eclipse.m2e.core.project.IMavenProjectFacade"/>
-   <service>
-      <provide interface="org.eclipse.core.runtime.IAdapterFactory"/>
-   </service>
-   <reference cardinality="1..1" field="mavenProjectRegistry" interface="org.eclipse.m2e.core.project.IMavenProjectRegistry" name="mavenProjectRegistry"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.registry.ProjectFacadeAdapterFactory"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager.xml
deleted file mode 100644
index bbd995d754..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="init" name="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager">
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager"/>
-   </service>
-   <reference bind="addMavenProjectChangedListener" cardinality="0..n" interface="org.eclipse.m2e.core.project.IMavenProjectChangedListener" name="MavenProjectChangedListener" policy="dynamic" unbind="removeMavenProjectChangedListener"/>
-   <reference bind="setWorkspace" cardinality="0..1" interface="org.eclipse.core.resources.IWorkspace" name="Workspace" policy="dynamic" unbind="unsetWorkspace"/>
-   <reference cardinality="1..1" field="configuration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="configuration"/>
-   <reference cardinality="1..1" field="markerManager" interface="org.eclipse.m2e.core.internal.markers.IMavenMarkerManager" name="markerManager"/>
-   <reference cardinality="1..1" field="maven" interface="org.eclipse.m2e.core.embedder.IMaven" name="maven"/>
-   <reference cardinality="1..1" field="stateReader" interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader" name="stateReader"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader.xml
deleted file mode 100644
index 6498368705..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" name="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader">
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader"/>
-   </service>
-   <implementation class="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryReader"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob.xml
deleted file mode 100644
index 45fe05e70f..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" deactivate="shutdown" name="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob">
-   <property name="event.mask" type="Integer" value="7"/>
-   <service>
-      <provide interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob"/>
-      <provide interface="org.eclipse.core.resources.IResourceChangeListener"/>
-   </service>
-   <reference cardinality="1..1" field="manager" interface="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager" name="manager"/>
-   <reference cardinality="1..1" field="mavenConfiguration" interface="org.eclipse.m2e.core.embedder.IMavenConfiguration" name="mavenConfiguration"/>
-   <implementation class="org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob"/>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.repository.RepositoryRegistry.xml b/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.repository.RepositoryRegistry.xml
deleted file mode 100644
index fbb3268ac5..0000000000
--- a/org.eclipse.m2e.core/OSGI-INF/org.eclipse.m2e.core.internal.repository.RepositoryRegistry.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="updateRegistry" name="org.eclipse.m2e.core.internal.repository.RepositoryRegistry">
-   <service>
-      <provide interface="org.eclipse.m2e.core.repository.IRepositoryRegistry"/>
-      <provide interface="org.eclipse.m2e.core.project.IMavenProjectChangedListener"/>
-      <provide interface="org.eclipse.m2e.core.embedder.ISettingsChangeListener"/>
-   </service>
-   <reference cardinality="1..1" field="maven" interface="org.eclipse.m2e.core.embedder.IMaven" name="maven"/>
-   <reference cardinality="1..1" field="projectManager" interface="org.eclipse.m2e.core.project.IMavenProjectRegistry" name="projectManager"/>
-   <implementation class="org.eclipse.m2e.core.internal.repository.RepositoryRegistry"/>
-</scr:component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8f0a33c8ff..1d84bc7af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<tycho-version>2.7.1</tycho-version>
+		<tycho-version>2.7.2</tycho-version>
 
 		<tycho.testArgLine>-Xmx800m</tycho.testArgLine>
 		<tycho.surefire.timeout>7200</tycho.surefire.timeout>
diff --git a/setup/tychoSnapshotSettings.xml b/setup/tychoSnapshotSettings.xml
index 142490ec62..7c753e69d4 100644
--- a/setup/tychoSnapshotSettings.xml
+++ b/setup/tychoSnapshotSettings.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0	https://maven.apache.org/xsd/settings-1.0.0.xsd">
 	<!-- This Maven-settings file allows to test Tycho snapshots without the need to install them into the local Maven repository 
 		and thus makes it possible to test snapshots of Tycho's extension in the CI.
-		To use it add the following arguments to the Maven command: --settings setup/tychoSnapshotSettings.xml -->
+		To use it add the following arguments to the Maven command: -s setup/tychoSnapshotSettings.xml -->
 	<profiles>
 		<profile>
 			<id>tycho-snapshots</id>