Remove tycho packaging

eclipse-sisu · Jan 30, 2023 · a67f3ac · a67f3ac
1 parent 3743d9f
commit a67f3ac
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 390 deletions.
diff --git a/org.eclipse.sisu.inject.extender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.inject.extender/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.inject.extender/build.properties b/org.eclipse.sisu.inject.extender/build.properties
diff --git a/org.eclipse.sisu.inject.extender/pom.xml b/org.eclipse.sisu.inject.extender/pom.xml
@@ -21,27 +21,33 @@
   </parent>
 
   <artifactId>org.eclipse.sisu.inject.extender</artifactId>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>META-INF/**</include>
+          <include>about.html</include>
+          <include>overview.html</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <archive>
+                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+              </archive>
+            </configuration>
+          </execution>
           <execution>
             <id>empty-javadoc</id>
             <phase>package</phase>

diff --git a/org.eclipse.sisu.inject.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.inject.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.inject.tests/pom.xml b/org.eclipse.sisu.inject.tests/pom.xml
@@ -36,13 +36,6 @@
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.inject</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <!-- Conflicts with Felix used in UTs -->
-          <groupId>org.osgi</groupId>
-          <artifactId>org.eclipse.osgi</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
@@ -95,6 +88,7 @@
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
@@ -116,6 +110,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
           <stripVersion>true</stripVersion>
@@ -225,6 +220,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
@@ -355,12 +351,21 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <skipSource>true</skipSource>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>
           <skip>true</skip>

diff --git a/org.eclipse.sisu.inject/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.inject/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.inject/build.properties b/org.eclipse.sisu.inject/build.properties
diff --git a/org.eclipse.sisu.inject/build.target b/org.eclipse.sisu.inject/build.target