Clean up and prepare for next release

MoreUnit · Nov 28, 2023 · 494f763 · 494f763
1 parent f2570b7
commit 494f763
Show file tree

Hide file tree

Showing 49 changed files with 174 additions and 525 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,10 +13,6 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        targetplatform: [eclipse-4.22, eclipse-4.24]
 
     steps:
       - name: Checkout 🛎
@@ -37,9 +33,12 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
-
+      -  name: Setup Maven
+         uses: stCarolas/[email protected]
+         with:
+           maven-version: 3.9.4
 
       - name: Install xvfb
         run: sudo apt-get install xvfb
@@ -49,11 +48,20 @@ jobs:
           BUILD_ID: "${{ steps.time.outputs.time }}"
           BUILD_TYPE: "S"
           BUILD_LABEL: "CI ${{ steps.time.outputs.time }} (${{ steps.branch_name.outputs.branch }})"
-        run: xvfb-run mvn -file org.moreunit.build/pom.xml verify -Dtarget.platform.classifier=${{ matrix.targetplatform }}  --fail-at-end -Dtycho.disableP2Mirrors=true --batch-mode --strict-checksums --update-snapshots -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        run: xvfb-run mvn -file org.moreunit.build/pom.xml clean install --fail-at-end -Dtycho.disableP2Mirrors=true --batch-mode --strict-checksums --update-snapshots -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       - name: Publish Surefire Test Results for  🖨
         if: ${{ always() }}
         uses: ScaCap/action-surefire-report@v1
         with:
-          check_name: Test Results for ${{ matrix.targetplatform }} 
+          check_name: Test Results
 
+      - name: Release SNAPSHOT
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: true
+          title: "Development Build"
+          files: |
+            ./org.moreunit.updatesite/target/org.moreunit.updatesite-*-SNAPSHOT.zip
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,3 @@ Thumbs.db
 
 # Tycho temp
 .tycho*
-
-# non osgi libs for JRE11+ compatibility
-org.moreunit.mock*/lib/
diff --git a/org.moreunit.build/README.txt b/org.moreunit.build/README.txt
diff --git a/org.moreunit.build/eclipse-4.22.target b/org.moreunit.build/eclipse-4.22.target
diff --git a/org.moreunit.build/eclipse-4.24.target b/org.moreunit.build/eclipse-4.24.target
diff --git a/org.moreunit.build/mvn clean install.launch b/org.moreunit.build/mvn clean install.launch
diff --git a/org.moreunit.build/pom.xml b/org.moreunit.build/pom.xml
@@ -23,22 +23,35 @@
   </modules>
 
   <properties>
-    <tycho-version>3.0.3</tycho-version>
-    <exec-maven-version>3.0.0</exec-maven-version>
+    <tycho-version>4.0.4</tycho-version>
+    <exec-maven-version>3.1.1</exec-maven-version>
+    <surefire-version>3.2.2</surefire-version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <tests.use.ui>false</tests.use.ui>
 
-    <target.platform.classifier>eclipse-4.24</target.platform.classifier>
+    <eclipse-repo.url>https://download.eclipse.org/releases/latest</eclipse-repo.url>
+    <testng-repo.url>https://testng.org/testng-eclipse-update-site</testng-repo.url>
   </properties>
-
+  <repositories>
+    <repository>
+      <id>eclipse-release</id>
+      <url>${eclipse-repo.url}</url>
+      <layout>p2</layout>
+    </repository>
+    <repository>
+      <id>testng-release</id>
+      <url>${testng-repo.url}</url>
+      <layout>p2</layout>
+    </repository>
+  </repositories>
   <build>
     <extensions>
       <extension>
         <groupId>org.codehaus.mojo</groupId>
-		<artifactId>exec-maven-plugin</artifactId>
+          <artifactId>exec-maven-plugin</artifactId>
         <version>${exec-maven-version}</version>
       </extension>
     </extensions>
@@ -68,14 +81,14 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>${surefire-version}</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-surefire-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>
-          	<providerHint>junit4</providerHint>
+            <providerHint>junit4</providerHint>
             <argLine>
               --add-opens java.base/java.lang=ALL-UNNAMED
             </argLine>
@@ -131,24 +144,14 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <target>
-            <artifact>
-              <groupId>org.moreunit</groupId>
-              <artifactId>moreunit</artifactId>
-              <version>${project.version}</version>
-              <classifier>${target.platform.classifier}</classifier>
-            </artifact>
-          </target>
-          <includePackedArtifacts>true</includePackedArtifacts>
-          <resolver>p2</resolver>
           <environments>
             <environment>
               <os>linux</os>