From d4ed17c5c83fe306faee5871b2740b5e63085bc5 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Mon, 26 Feb 2024 12:14:59 +1100
Subject: [PATCH] Testing

---
 .github/workflows/maven-build.yml   | 29 --------------------
 .github/workflows/pull-request.yaml | 29 ++++++++++++++++++++
 pom.xml                             | 41 +++--------------------------
 settings.xml                        | 37 ++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 67 deletions(-)
 delete mode 100644 .github/workflows/maven-build.yml
 create mode 100644 .github/workflows/pull-request.yaml
 create mode 100644 settings.xml

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
deleted file mode 100644
index 4718a6ce5..000000000
--- a/.github/workflows/maven-build.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '17' ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{matrix.java}}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{matrix.java}}
-          distribution: 'adopt'
-          cache: maven
-      - name: Build with Maven Wrapper
-        run: ./mvnw -B package
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
new file mode 100644
index 000000000..3b9f3892b
--- /dev/null
+++ b/.github/workflows/pull-request.yaml
@@ -0,0 +1,29 @@
+name: Pull Request Build
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build-image:
+    environment: default
+    runs-on: ubuntu-latest
+    steps:
+      -   name: Checkout
+          uses: actions/checkout@v3
+      -   uses: actions/setup-java@v3
+          with:
+            distribution: 'temurin' # See 'Supported distributions' for available options
+            java-version: '17'
+      -   name: Build and export
+          run: |
+            #!/bin/bash
+            mvn clean install -s settings.xml -B -Dmaven.repo.local=repo
+            docker run -v `pwd`/repo:/repo -v `pwd`/target:/target quay.io/mk-ci-cd/apheleia-processor:57570450fc78697661497b1b604d1bd2253be2fa /opt/jboss/container/java/run/run-java.sh analyse --maven-repo=/repo /target/hacbs-test.jar --sbom-path /target/sbom.json --build-sbom-path /target/build-sbom.json || true
+      -   uses: actions/upload-artifact@v3
+          with:
+            name: sbom.json
+            path: target/sbom.json
+      -   uses: actions/upload-artifact@v3
+          with:
+            name: build-sbom.json
+            path: target/build-sbom.json
diff --git a/pom.xml b/pom.xml
index cf47f8aa6..236d5e751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,41 +176,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${maven-checkstyle.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${checkstyle.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>io.spring.nohttp</groupId>
-            <artifactId>nohttp-checkstyle</artifactId>
-            <version>${nohttp-checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>nohttp-checkstyle-validation</id>
-            <phase>validate</phase>
-            <configuration>
-              <configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
-              <sourceDirectories>${basedir}</sourceDirectories>
-              <includes>**/*</includes>
-              <excludes>**/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class</excludes>
-              <propertyExpansion>
-                config_loc=${basedir}/src/checkstyle/
-              </propertyExpansion>
-            </configuration>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.graalvm.buildtools</groupId>
         <artifactId>native-maven-plugin</artifactId>
@@ -220,7 +185,7 @@
         <artifactId>spring-boot-maven-plugin</artifactId>
         <executions>
           <execution>
-            <!-- Spring Boot Actuator displays build-related information 
+            <!-- Spring Boot Actuator displays build-related information
               if a META-INF/build-info.properties file is present -->
             <goals>
               <goal>build-info</goal>
@@ -378,7 +343,7 @@
       <build>
         <pluginManagement>
           <plugins>
-            <!-- This plugin's configuration is used to store Eclipse m2e settings 
+            <!-- This plugin's configuration is used to store Eclipse m2e settings
               only. It has no influence on the Maven build itself. -->
             <plugin>
               <groupId>org.eclipse.m2e</groupId>
@@ -436,4 +401,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000..8e7feaea1
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,37 @@
+<settings>
+
+    <mirrors>
+        <mirror>
+        <id>maven-default-http-blocker</id>
+        <mirrorOf>external:http:*</mirrorOf>
+        <name>Pseudo repository to mirror external repositories initially using HTTP.</name>
+        <url>http://nexus3-nexus.apps.sdouglas2.clusters.stonesoupengineering.com/repository/rebuilt-downloads/</url>
+        <blocked>false</blocked>
+        </mirror>
+        <mirror>
+        <id>others</id>
+        <mirrorOf>*</mirrorOf>
+        <name>Pseudo repository to mirror external repositories initially using HTTP.</name>
+        <url>http://nexus3-nexus.apps.sdouglas2.clusters.stonesoupengineering.com/repository/rebuilt-downloads/</url>
+        <blocked>false</blocked>
+        </mirror>
+    </mirrors>
+    <profiles>
+        <profile>
+            <id>demo</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>demo-demo_repo</id>
+                    <url>http://nexus3-nexus.apps.sdouglas2.clusters.stonesoupengineering.com/repository/rebuilt-downloads/</url>
+                </repository>
+            </repositories>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>demo</activeProfile>
+    </activeProfiles>
+
+</settings>