[releng] Remove duplicated dependencies

Signed-off-by: Stéphane Bégaudeau <[email protected]>
jerome-obeo · Jul 11, 2024 · ffff628 · ffff628
1 parent d656522
commit ffff628
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 142 deletions.
diff --git a/packages/charts/backend/sirius-components-charts-graphql/pom.xml b/packages/charts/backend/sirius-components-charts-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-charts</artifactId>

diff --git a/packages/core/backend/sirius-components-core/pom.xml b/packages/core/backend/sirius-components-core/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-representations</artifactId>

diff --git a/packages/deck/backend/sirius-components-deck-graphql/pom.xml b/packages/deck/backend/sirius-components-deck-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-deck</artifactId>

diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml b/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-diagrams</artifactId>

diff --git a/...s/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml b/...s/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-formdescriptioneditors</artifactId>

diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-core</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-representations</artifactId>

diff --git a/packages/forms/backend/sirius-components-forms-graphql/pom.xml b/packages/forms/backend/sirius-components-forms-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-forms</artifactId>

diff --git a/packages/forms/backend/sirius-components-forms/pom.xml b/packages/forms/backend/sirius-components-forms/pom.xml
@@ -44,11 +44,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-representations</artifactId>

diff --git a/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml b/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-widget-reference</artifactId>

diff --git a/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml b/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-gantt</artifactId>

diff --git a/packages/portals/backend/sirius-components-portals-graphql/pom.xml b/packages/portals/backend/sirius-components-portals-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-portals</artifactId>

diff --git a/packages/portals/backend/sirius-components-portals/pom.xml b/packages/portals/backend/sirius-components-portals/pom.xml
@@ -40,11 +40,6 @@
 	</distributionManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-representations</artifactId>

diff --git a/packages/selection/backend/sirius-components-selection-graphql/pom.xml b/packages/selection/backend/sirius-components-selection-graphql/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-components-graphql-api</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-collaborative-selection</artifactId>

diff --git a/packages/selection/backend/sirius-components-selection/pom.xml b/packages/selection/backend/sirius-components-selection/pom.xml
@@ -40,11 +40,6 @@
 	</distributionManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-representations</artifactId>

diff --git a/packages/sirius-web/backend/sirius-web-application/pom.xml b/packages/sirius-web/backend/sirius-web-application/pom.xml
@@ -49,11 +49,6 @@
 			<artifactId>sirius-web-domain</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-graphql-api</artifactId>

diff --git a/packages/sirius-web/backend/sirius-web-graphql/pom.xml b/packages/sirius-web/backend/sirius-web-graphql/pom.xml
@@ -45,16 +45,6 @@
 			<artifactId>sirius-components-interpreter</artifactId>
 			<version>2024.7.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sirius</groupId>
-			<artifactId>sirius-components-annotations-spring</artifactId>
-			<version>2024.7.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-graphql-api</artifactId>

diff --git a/...papaya/src/main/java/org/eclipse/sirius/web/papaya/factories/SiriusWebProjectFactory.java b/...papaya/src/main/java/org/eclipse/sirius/web/papaya/factories/SiriusWebProjectFactory.java
@@ -595,7 +595,6 @@ private void linkCore(IEObjectIndexer eObjectIndexer) {
         siriusComponentsRepresentations.getDependencies().add(siriusComponentsAnnotations);
 
         siriusComponentsCore.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsRepresentations
         ));
 
@@ -624,11 +623,9 @@ private void linkDeck(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsDeckGraphQL = eObjectIndexer.getComponent("sirius-components-deck-graphql");
         siriusComponentsDeckGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeDeck
         ));
 
@@ -647,11 +644,9 @@ private void linkDiagrams(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsDiagramsGraphQL = eObjectIndexer.getComponent("sirius-components-diagrams-graphql");
         siriusComponentsDiagramsGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeDiagrams
         ));
     }
@@ -690,14 +685,12 @@ private void linkEMF(IEObjectIndexer eObjectIndexer) {
     }
 
     private void linkFormDescriptionEditors(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsCore = eObjectIndexer.getComponent("sirius-components-core");
         var siriusComponentsRepresentations = eObjectIndexer.getComponent("sirius-components-representations");
         var siriusComponentsForms = eObjectIndexer.getComponent("sirius-components-forms");
         var siriusComponentsViewForm = eObjectIndexer.getComponent("sirius-components-view-form");
         var siriusComponentsFormDescriptionEditors = eObjectIndexer.getComponent("sirius-components-formdescriptioneditors");
         siriusComponentsFormDescriptionEditors.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsCore,
                 siriusComponentsRepresentations,
                 siriusComponentsForms,
@@ -712,11 +705,9 @@ private void linkFormDescriptionEditors(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsFormDescriptionEditorsGraphQL = eObjectIndexer.getComponent("sirius-components-formdescriptioneditors-graphql");
         siriusComponentsFormDescriptionEditorsGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeFormDescriptionEditors
         ));
 
@@ -729,12 +720,10 @@ private void linkFormDescriptionEditors(IEObjectIndexer eObjectIndexer) {
     }
 
     private void linkForms(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsRepresentations = eObjectIndexer.getComponent("sirius-components-representations");
         var siriusComponentsCharts = eObjectIndexer.getComponent("sirius-components-charts");
         var siriusComponentsForms = eObjectIndexer.getComponent("sirius-components-forms");
         siriusComponentsForms.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsRepresentations,
                 siriusComponentsCharts
         ));
@@ -749,11 +738,9 @@ private void linkForms(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsFormsGraphQL = eObjectIndexer.getComponent("sirius-components-forms-graphql");
         siriusComponentsFormsGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsForms,
                 siriusComponentsCollaborativeForms
         ));
@@ -776,7 +763,6 @@ private void linkForms(IEObjectIndexer eObjectIndexer) {
         var siriusComponentsWidgetReferenceGraphQL = eObjectIndexer.getComponent("sirius-components-widget-reference-graphql");
         siriusComponentsWidgetReferenceGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeWidgetReference
         ));
     }
@@ -794,11 +780,9 @@ private void linkGantt(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsGanttGraphQL = eObjectIndexer.getComponent("sirius-components-gantt-graphql");
         siriusComponentsGanttGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeGantt
         ));
     }
@@ -810,11 +794,9 @@ private void linkPapaya(IEObjectIndexer eObjectIndexer) {
     }
 
     private void linkPortals(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsRepresentations = eObjectIndexer.getComponent("sirius-components-representations");
         var siriusComponentsPortals = eObjectIndexer.getComponent("sirius-components-portals");
         siriusComponentsPortals.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsRepresentations
         ));
 
@@ -826,21 +808,17 @@ private void linkPortals(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsPortalsGraphQL = eObjectIndexer.getComponent("sirius-components-portals-graphql");
         siriusComponentsPortalsGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativePortals
         ));
     }
 
     private void linkSelection(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsRepresentations = eObjectIndexer.getComponent("sirius-components-representations");
         var siriusComponentsSelection = eObjectIndexer.getComponent("sirius-components-selection");
         siriusComponentsSelection.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsRepresentations
         ));
 
@@ -852,11 +830,9 @@ private void linkSelection(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsSelectionGraphQL = eObjectIndexer.getComponent("sirius-components-selection-graphql");
         siriusComponentsSelectionGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeSelection
         ));
     }
@@ -954,11 +930,9 @@ private void linkSiriusWeb(IEObjectIndexer eObjectIndexer) {
     }
 
     private void linkTrees(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsRepresentations = eObjectIndexer.getComponent("sirius-components-representations");
         var siriusComponentsTrees = eObjectIndexer.getComponent("sirius-components-trees");
         siriusComponentsTrees.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsRepresentations
         ));
 
@@ -971,11 +945,9 @@ private void linkTrees(IEObjectIndexer eObjectIndexer) {
 
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsTreesGraphQL = eObjectIndexer.getComponent("sirius-components-trees-graphql");
         siriusComponentsTreesGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeTrees
         ));
     }
@@ -995,11 +967,9 @@ private void linkValidation(IEObjectIndexer eObjectIndexer) {
         ));
 
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
-        var siriusComponentsAnnotationsSpring = eObjectIndexer.getComponent("sirius-components-annotations-spring");
         var siriusComponentsValidationGraphQL = eObjectIndexer.getComponent("sirius-components-validation-graphql");
         siriusComponentsValidationGraphQL.getDependencies().addAll(List.of(
                 siriusComponentsGraphQLApi,
-                siriusComponentsAnnotationsSpring,
                 siriusComponentsCollaborativeValidation
         ));
     }
@@ -1059,11 +1029,9 @@ private void linkView(IEObjectIndexer eObjectIndexer) {
     }
 
     private void linkWeb(IEObjectIndexer eObjectIndexer) {
-        var siriusComponentsAnnotations = eObjectIndexer.getComponent("sirius-components-annotations");
         var siriusComponentsGraphQLApi = eObjectIndexer.getComponent("sirius-components-graphql-api");
         var siriusComponentsGraphQL = eObjectIndexer.getComponent("sirius-components-graphql");
         siriusComponentsGraphQL.getDependencies().addAll(List.of(
-                siriusComponentsAnnotations,
                 siriusComponentsGraphQLApi
         ));