Merge pull request #2336 from rnc/JBS79

Removal of migrated code. Renaming.

Author: rnc

deploy/pipeline/mw-pipeline-v0.1.yaml

@@ -66,7 +66,7 @@ spec:
       type: string
     - name: INDY_PROXY_CLIENT_CREDENTIAL
       type: string
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
+    - name: PNC_KONFLUX_TOOLING_IMAGE
       type: string
       default: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
     - name: NOTIFICATION_CONTEXT
@@ -105,8 +105,8 @@ spec:
       runAfter:
         - git-clone
       params:
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: IMAGE_URL
           value: $(params.QUAY_REPO):trusted-source-$(context.pipelineRun.name)
         - name: NAME
@@ -130,7 +130,7 @@ spec:
         resolver: http
         params:
           - name: url
-            value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR1/deploy/tasks/pre-build.yaml
+            value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/pre-build.yaml
       workspaces:
         - name: source
           workspace: source
@@ -199,8 +199,8 @@ spec:
       runAfter:
         - buildah-oci-ta
       params:
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: IMAGE_URL
           value: $(tasks.buildah-oci-ta.results.IMAGE_URL)
         - name: IMAGE_DIGEST
@@ -221,8 +221,8 @@ spec:
       params:
         - name: ACCESS_TOKEN
           value: $(params.ACCESS_TOKEN)
-        - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-          value: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - name: PNC_KONFLUX_TOOLING_IMAGE
+          value: $(params.PNC_KONFLUX_TOOLING_IMAGE)
         - name: NOTIFICATION_CONTEXT
           value: $(params.NOTIFICATION_CONTEXT)
         - name: STATUS
@@ -233,8 +233,8 @@ spec:
             description: Access token for OAuth.
             type: string
             default: ""
-          - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-            description: Name of the processor image. Useful to override for development.
+          - name: PNC_KONFLUX_TOOLING_IMAGE
+            description: Name of the tooling image.
             type: string
           - name: NOTIFICATION_CONTEXT
             description: Notification context
@@ -244,7 +244,7 @@ spec:
             type: string
         steps:
           - name: notification
-            image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+            image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
             args:
               - notify
               - --context=$(params.NOTIFICATION_CONTEXT)

deploy/tasks/maven-deployment.yaml

@@ -39,8 +39,8 @@ spec:
       description: Access token for OAuth.
       type: string
       default: ""
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-      description: Name of the processor image. Useful to override for development.
+    - name: PNC_KONFLUX_TOOLING_IMAGE
+      description: Name of the tooling image.
       type: string
     - name: caTrustConfigMapKey
       description: The name of the key in the ConfigMap that contains the
@@ -81,7 +81,7 @@ spec:
         - name: IMAGE_URL
           value: $(params.IMAGE_URL)
     - name: deploy
-      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
       securityContext:
         runAsUser: 0
       computeResources:

deploy/tasks/pre-build.yaml

@@ -24,8 +24,8 @@ spec:
     - name: IMAGE_URL
       description: URL of the OCI image to use.
       type: string
-    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
-      description: Name of the processor image. Useful to override for development.
+    - name: PNC_KONFLUX_TOOLING_IMAGE
+      description: Name of the tooling image.
       type: string
     - name: RECIPE_IMAGE
       description: The image from the build recipe to use
@@ -38,7 +38,7 @@ spec:
       mountPath: /var/workdir
   steps:
     - name: preprocessor
-      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
       securityContext:
         runAsUser: 0
       computeResources:
@@ -53,7 +53,7 @@ spec:
         - --build-tool-version=$(params.BUILD_TOOL_VERSION)
         - --java-version=$(params.JAVA_VERSION)
         - --recipe-image=$(params.RECIPE_IMAGE)
-        - --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+        - --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE)
         - --type=$(params.BUILD_TOOL)
         - $(workspaces.source.path)/source
       env:

java-components/build-request-processor/pom.xml

@@ -108,13 +108,6 @@
             <artifactId>pom-manipulation-common</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -136,9 +129,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock</artifactId>
-            <scope>test</scope>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/EntryPoint.java

@@ -8,10 +8,8 @@
 import com.redhat.hacbs.container.build.preprocessor.maven.MavenPrepareCommand;
 import com.redhat.hacbs.container.build.preprocessor.sbt.SBTPrepareCommand;
 import com.redhat.hacbs.container.deploy.BuildVerifyCommand;
-import com.redhat.hacbs.container.deploy.CopyArtifactsCommand;
 import com.redhat.hacbs.container.deploy.DeployCommand;
 import com.redhat.hacbs.container.deploy.DeployPreBuildSourceCommand;
-import com.redhat.hacbs.container.notification.NotifyCommand;
 import com.redhat.hacbs.container.verifier.VerifyBuiltArtifactsCommand;
 
 import io.quarkus.picocli.runtime.annotations.TopCommand;
@@ -21,14 +19,12 @@
 @CommandLine.Command(mixinStandardHelpOptions = true, subcommands = {
         AnalyseDependencies.class,
         AntPrepareCommand.class,
-        CopyArtifactsCommand.class,
         BuildVerifyCommand.class,
         GradlePrepareCommand.class,
         DeployPreBuildSourceCommand.class,
         LookupBuildInfoCommand.class,
         LookupScmLocationCommand.class,
         DeployCommand.class,
-        NotifyCommand.class,
         MavenPrepareCommand.class,
         SBTPrepareCommand.class,
         VerifyBuiltArtifactsCommand.class