Bump version.tycho from 3.0.5 to 4.0.4

Also raise minimum Maven version from 3.6.3 to 3.9.0 and use Maven container instead of installed Maven since installed Maven is still 3.8.8 at this time. Split main workflow into 2 jobs, one to build native binaries and the other to use Maven container.
ge-high-assurance · Nov 20, 2023 · d6bf824 · d6bf824
1 parent 75d74e4
commit d6bf824
Show file tree

Hide file tree

Showing 126 changed files with 2,636 additions and 2,573 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -1,22 +1,28 @@
-# Runs whenever a pull request is created, modified, or reopened
-
 name: RITE Integration Workflow
 
+# Runs whenever a pull request is created, reopened, or modified
+
 on:
   pull_request:
     types: [ opened, reopened, synchronize ]
   workflow_dispatch:
 
-# Builds RITE source with Java and Maven
-# Caches Maven dependencies
+# Runs integration workflow as a CI check:
+# - Builds RITE source and runs unit tests
 
 jobs:
   integration:
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         os: [ ubuntu-22.04 ]
 
     steps:
@@ -26,7 +32,7 @@ jobs:
     - name: Set up Java and Maven
       uses: actions/[email protected]
       with:
-        #cache: maven
+        cache: maven
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java-version }}
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,23 +1,29 @@
-# Runs whenever the main branch is changed (except for tags)
-
 name: RITE Main Workflow
 
+# Runs whenever the main branch is changed (except for tags)
+
 on:
   push:
     branches: [ main, march-release-v3 ]
     tags-ignore: [ '*' ]
   workflow_dispatch:
 
-# Builds RITE source with Java and Maven
-# Caches Maven dependencies
+# Runs main workflow and uploads build artifacts:
+# - Builds RITE source and runs unit tests
 
 jobs:
   main:
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         os: [ ubuntu-22.04 ]
 
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,22 +1,28 @@
-# Runs whenever a release is published on GitHub
-
 name: RITE Release Workflow
 
+# Runs whenever a release is published on GitHub
+
 on:
   release:
     types: [ published ]
 
-# Builds RITE source with Java and Maven
-# Caches Maven dependencies
-# Uploads RITE zips to release page
+# Runs release workflow and uploads build artifacts:
+# - Builds RITE source and runs unit tests
+# - Uploads RITE zips to release page
 
 jobs:
   release:
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         os: [ ubuntu-22.04 ]
 
     steps:

diff --git a/tools/rack/pom.xml b/tools/rack/pom.xml
@@ -25,24 +25,24 @@
     <copyright.holders>Copyright (c) $today.year, General Electric Company and Galois, Inc.</copyright.holders>
     <copyright.license>/*
  * BSD 3-Clause License
- * 
+ *
  * ${copyright.holders}
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * 3. Neither the name of the copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived from
  *    this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -56,17 +56,15 @@
  */</copyright.license>
     <!-- Settings of Maven plugins -->
     <maven.compiler.release>17</maven.compiler.release>
-    <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
-    <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <!-- For multiple dependencies which use the same version -->
+    <!-- Versions of dependencies which share the same version -->
     <version.javafx>21.0.1</version.javafx>
     <version.rack>${project.version}</version.rack>
     <version.surefire>3.2.2</version.surefire>
-    <version.tycho>3.0.5</version.tycho>
+    <version.tycho>4.0.4</version.tycho>
   </properties>
 
   <!-- Set all dependency versions in one place -->
@@ -256,7 +254,7 @@
         <plugin>
           <groupId>com.diffplug.spotless</groupId>
           <artifactId>spotless-maven-plugin</artifactId>
-          <version>2.36.0</version>
+          <version>2.40.0</version>
           <configuration>
             <java>
               <includes>
@@ -287,7 +285,7 @@
                 <endWithNewline></endWithNewline>
                 <indent>
                   <spaces>true</spaces>
-                  <spacesPerTab>4</spacesPerTab>
+                  <spacesPerTab>2</spacesPerTab>
                 </indent>
               </format>
             </formats>
@@ -360,7 +358,7 @@
           <configuration>
             <rules>
               <requireMavenVersion>
-                <version>[3.6.3,)</version>
+                <version>[3.9.0,)</version>
               </requireMavenVersion>
             </rules>
           </configuration>
@@ -428,10 +426,10 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>2.15.0</version>
+          <version>2.16.2</version>
         </plugin>
+        <!-- Define the target platform -->
         <plugin>
-          <?m2e ignore?>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>target-platform-configuration</artifactId>
           <version>${version.tycho}</version>
@@ -476,6 +474,13 @@
             </target>
           </configuration>
         </plugin>
+        <!-- Suppress an Eclipse m2e lifecycle warning -->
+        <plugin>
+          <?m2e ignore?>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-bnd-plugin</artifactId>
+          <version>${version.tycho}</version>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-compiler-plugin</artifactId>
@@ -484,27 +489,20 @@
             <useProjectSettings>false</useProjectSettings>
           </configuration>
         </plugin>
+        <!-- Tycho needs extensions -->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-maven-plugin</artifactId>
           <version>${version.tycho}</version>
           <extensions>true</extensions>
         </plugin>
+        <!-- Tycho can build Eclipse products too -->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-p2-director-plugin</artifactId>
           <version>${version.tycho}</version>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-plugin</artifactId>
-          <version>${version.tycho}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-publisher-plugin</artifactId>
-          <version>${version.tycho}</version>
-        </plugin>
+        <!-- Tycho can build Eclipse p2 repositories too -->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-p2-repository-plugin</artifactId>
@@ -518,22 +516,9 @@
           <artifactId>tycho-packaging-plugin</artifactId>
           <version>${version.tycho}</version>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-source-plugin</artifactId>
-          <version>${version.tycho}</version>
-          <executions>
-            <execution>
-              <id>default-plugin-source</id>
-              <goals>
-                <goal>plugin-source</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- To skip running (and compiling) tests, use: -Dmaven.test.skip -->
-        <!-- To skip tests, but still compile them, use: -DskipTests -->
-        <!-- To run all tests but only fail at end, use: -fae -->
+        <!-- To skip running (and compiling) tests: -Dmaven.test.skip -->
+        <!-- To skip tests, but still compile them: -DskipTests -->
+        <!-- To run all tests but only fail at end: -fae -->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-surefire-plugin</artifactId>
@@ -547,11 +532,6 @@
             <useUIHarness>true</useUIHarness>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-versions-plugin</artifactId>
-          <version>${version.tycho}</version>
-        </plugin>
       </plugins>
     </pluginManagement>