Remove tycho packaging

eclipse-sisu · Mar 26, 2023 · a118f29 · a118f29
1 parent 8624b76
commit a118f29
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 423 deletions.
diff --git a/org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.plexus.extender/build.properties b/org.eclipse.sisu.plexus.extender/build.properties
diff --git a/org.eclipse.sisu.plexus.extender/pom.xml b/org.eclipse.sisu.plexus.extender/pom.xml
@@ -21,27 +21,33 @@
   </parent>
 
   <artifactId>org.eclipse.sisu.plexus.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.plexus.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.plexus.tests/pom.xml b/org.eclipse.sisu.plexus.tests/pom.xml
@@ -64,6 +64,7 @@
     </resources>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
           <stripVersion>true</stripVersion>
@@ -182,6 +183,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
@@ -275,6 +277,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
         <executions>
           <execution>
@@ -324,12 +327,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.plexus/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.sisu.plexus/build.properties b/org.eclipse.sisu.plexus/build.properties
diff --git a/org.eclipse.sisu.plexus/build.target b/org.eclipse.sisu.plexus/build.target
diff --git a/org.eclipse.sisu.plexus/pom.xml b/org.eclipse.sisu.plexus/pom.xml
@@ -21,7 +21,7 @@
   </parent>
 
   <artifactId>org.eclipse.sisu.plexus</artifactId>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <dependencies>
     <!--
@@ -82,6 +82,18 @@
       <artifactId>plexus-utils</artifactId>
       <version>3.3.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.36</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.core</artifactId>
+      <version>5.0.0</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -92,66 +104,28 @@
 
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>META-INF/**</include>
+          <include>about.html</include>
+          <include>overview.html</include>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-build-target</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>build.target</file>
-                  <classifier>build</classifier>
-                  <type>target</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <extensions>${tycho.extensions}</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
       </plugin>
     </plugins>
   </build>
 
-  <!--
-  Disable Tycho extensions so artifact can be consumed by Java 8 builds.
-  -->
-  <properties>
-    <tycho.extensions>false</tycho.extensions>
-  </properties>
-  <profiles>
-    <profile>
-      <!--
-      Enable Tycho extensions when building the project artifact.
-      -->
-      <id>tycho.extensions</id>
-      <activation>
-        <file>
-          <exists>src</exists>
-        </file>
-      </activation>
-      <properties>
-        <tycho.extensions>true</tycho.extensions>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>