remove m2e.archetype.common-dependency from org.eclipse.scout.sdk.s2e

eclipse-scout · Sep 13, 2023 · 4d3e004 · 4d3e004
1 parent 1c577df
commit 4d3e004
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 177 deletions.
diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml
@@ -26,14 +26,14 @@
     To update the Eclipse artifacts needed by the Maven class-loader side of Eclipse Scout SDK:
 
     1.  If needed, update the source p2 repository below
-    2.  Update versions in the parent POM: ${org.eclipse.m2e.core}, ${org.eclipse.m2e.core.ui}, ${org.eclipse.m2e.archetype.common}, ...
+    2.  Update versions in the parent POM: ${org.eclipse.m2e.core}, ${org.eclipse.m2e.core.ui}, ...
     3a. For deploying snapshots (to be used by Eclipse Scout SDK snapshots)
         - In org.eclipse.scout.sdk.s2e.releng/, execute
           mvn clean deploy
     3b. For deploying releases (to be used by Tycho releases):
         - Prerequisite: 1. you need to have GPG properly set up, see https://central.sonatype.org/publish/requirements/gpg/
                         2. if not already present: you need to add the server with id 'ossrh' into your settings.xml including the corresponding credentials (e.g. oss sonatype username/password)
-        - Make sure that ${org.eclipse.m2e.core}, ${org.eclipse.m2e.core.ui}, ${org.eclipse.m2e.archetype.common},... in the parent POM don't have a '-SNAPSHOT' suffix
+        - Make sure that ${org.eclipse.m2e.core}, ${org.eclipse.m2e.core.ui},... in the parent POM don't have a '-SNAPSHOT' suffix
         3b.1 For full deploy: In org.eclipse.scout.sdk.s2e.releng/, execute
              mvn clean deploy -P deploy-releases
         3b.2 For single additional deps: In org.eclipse.scout.sdk.s2e.releng/, execute
@@ -126,10 +126,6 @@
               <id>org.eclipse.m2e.core.source</id>
               <version>${org.eclipse.m2e.core}</version>
             </iu>
-            <iu>
-              <id>org.eclipse.m2e.archetype.common</id>
-              <version>${org.eclipse.m2e.archetype.common}</version>
-            </iu>
             <iu>
               <id>org.eclipse.m2e.core.ui</id>
               <version>${org.eclipse.m2e.core.ui}</version>
@@ -217,17 +213,6 @@
                   <pomFile>${project.build.outputDirectory}/org.eclipse.m2e.core.ui.pom</pomFile>
                 </configuration>
               </execution>
-              <execution>
-                <id>deploy-m2e-archetype-common</id>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>${downloaded}/org.eclipse.m2e.archetype.common_${org.eclipse.m2e.archetype.common}.jar</file>
-                  <pomFile>${project.build.outputDirectory}/org.eclipse.m2e.archetype.common.pom</pomFile>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -279,22 +264,6 @@
                   </gpgArguments>
                 </configuration>
               </execution>
-              <execution>
-                <id>deploy-m2e-archetype-common</id>
-                <goals>
-                  <goal>sign-and-deploy-file</goal>
-                </goals>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>${downloaded}/org.eclipse.m2e.archetype.common_${org.eclipse.m2e.archetype.common}.jar</file>
-                  <pomFile>${project.build.outputDirectory}/org.eclipse.m2e.archetype.common.pom</pomFile>
-                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
-                  <gpgArguments>
-            		<arg>--pinentry-mode</arg>
-            		<arg>loopback</arg>
-         		  </gpgArguments>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>

diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.archetype.common.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.archetype.common.pom
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom
@@ -63,11 +63,6 @@
       <artifactId>org.eclipse.core.filesystem</artifactId>
       <version>${org.eclipse.core.filesystem}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.scout.sdk.deps</groupId>
-      <artifactId>org.eclipse.m2e.archetype.common</artifactId>
-      <version>${org.eclipse.m2e.archetype.common}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.ui.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.ui.pom
@@ -63,11 +63,6 @@
       <artifactId>org.eclipse.m2e.core</artifactId>
       <version>${org.eclipse.m2e.core}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.scout.sdk.deps</groupId>
-      <artifactId>org.eclipse.m2e.archetype.common</artifactId>
-      <version>${org.eclipse.m2e.archetype.common}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.ui.console</artifactId>

diff --git a/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml b/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml
@@ -41,6 +41,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.platform:org.eclipse.text:3.12.300" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.platform:org.eclipse.core.filebuffers:3.7.200" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.core:2.0.7.20230307-1553" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.archetype.common:3.2.103.20230102-2253" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
@@ -49,44 +50,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:3.8.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.5.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.archetype.common:3.2.103.20230102-2253" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.archetype:archetype-catalog:3.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.archetype:archetype-common:3.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.archetype:archetype-descriptor:3.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.groovy:groovy-all:2.4.16" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.ivy:ivy:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-component-annotations:2.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.shared:maven-invoker:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.shared:maven-shared-utils:3.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-aether-provider:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model-builder:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:3.8.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-api:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-util:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-impl:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-spi:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.shared:maven-artifact-transfer:0.13.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-core:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings-builder:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-classworlds:2.2.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.shared:maven-common-artifact-filters:3.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-velocity:1.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:72.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.3.1" level="project" />
   </component>
 </module>
diff --git a/org.eclipse.scout.sdk.s2e/pom.xml b/org.eclipse.scout.sdk.s2e/pom.xml
@@ -68,28 +68,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.scout.sdk.deps</groupId>
-      <artifactId>org.eclipse.m2e.archetype.common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archetype</groupId>
-      <artifactId>archetype-catalog</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archetype</groupId>
-      <artifactId>archetype-common</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-project</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -134,7 +114,6 @@
               org.eclipse.jdt.launching;bundle-version="[3.19.700,4)";visibility:=reexport,
               org.eclipse.text;bundle-version="[3.12.200,4)";visibility:=reexport,
               org.eclipse.m2e.maven.runtime;bundle-version="[3.8.701,4.0)";visibility:=reexport,
-              org.eclipse.m2e.archetype.common;bundle-version="[3.2.103,4.0)";visibility:=reexport,
               org.eclipse.m2e.core;bundle-version="[2.0.7,3)";visibility:=reexport
             </Require-Bundle>
 

diff --git a/org.eclipse.scout.sdk/pom.xml b/org.eclipse.scout.sdk/pom.xml
@@ -190,7 +190,6 @@
     <!-- versions to dependencies uploaded by scout -->
     <org.eclipse.m2e.core>2.0.7.20230307-1553</org.eclipse.m2e.core>
     <org.eclipse.m2e.core.ui>2.0.4.20230305-1928</org.eclipse.m2e.core.ui>
-    <org.eclipse.m2e.archetype.common>3.2.103.20230102-2253</org.eclipse.m2e.archetype.common>
     <maven.model.dependency.version>3.8.7</maven.model.dependency.version>
   </properties>
 
@@ -786,11 +785,6 @@
         <artifactId>org.eclipse.m2e.core.ui</artifactId>
         <version>${org.eclipse.m2e.core.ui}</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.scout.sdk.deps</groupId>
-        <artifactId>org.eclipse.m2e.archetype.common</artifactId>
-        <version>${org.eclipse.m2e.archetype.common}</version>
-      </dependency>
 
       <dependency>
         <groupId>com.ibm.icu</groupId>
@@ -851,16 +845,6 @@
         <artifactId>maven-compat</artifactId>
         <version>${maven.model.dependency.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-catalog</artifactId>
-        <version>3.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-common</artifactId>
-        <version>3.2.1</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven.resolver</groupId>
         <artifactId>maven-resolver-connector-basic</artifactId>