Merge pull request #373 from jamezp/fix-ci

Use the correct paths to trigger CI.
eclipse · Jun 7, 2024 · 78693d7 · 78693d7
2 parents 36f1319 + 5312799
commit 78693d7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,18 +5,20 @@ on:
     branches-ignore:
       - 'dependabot/**'
     paths:
+        - '.github/workflows/maven.yml'
         - '**/pom.xml'
-        - 'api'
-        - 'spec'
-        - 'tck'
+        - 'api/**'
+        - 'spec/**'
+        - 'tck/**'
   pull_request:
     branches:
       - '**'
     paths:
+        - '.github/workflows/maven.yml'
         - '**/pom.xml'
-        - 'api'
-        - 'spec'
-        - 'tck'
+        - 'api/**'
+        - 'spec/**'
+        - 'tck/**'
 
 # Only run the latest job
 concurrency:

diff --git a/tck/src/main/java/org/eclipse/microprofile/rest/client/tck/cditests/ClientClosedTest.java b/tck/src/main/java/org/eclipse/microprofile/rest/client/tck/cditests/ClientClosedTest.java
@@ -18,12 +18,6 @@
 
 package org.eclipse.microprofile.rest.client.tck.cditests;
 
-import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.ApplicationPath;
-import jakarta.ws.rs.core.Application;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.eclipse.microprofile.rest.client.tck.interfaces.cdi.scoped.AutoCloseableClient;
 import org.eclipse.microprofile.rest.client.tck.interfaces.cdi.scoped.CloseableClient;
@@ -38,6 +32,13 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
+
 /**
  * Tests that clients are closed when destroyed by the CDI container.
  *
@@ -48,9 +49,9 @@ public class ClientClosedTest extends Arquillian {
     @Deployment
     public static Archive<?> createDeployment() {
         return ShrinkWrap.create(WebArchive.class, ClientClosedTest.class.getSimpleName() + ".war")
-            .addClasses(ReturnWith200RequestFilter.class, AutoCloseableClient.class,
-                CloseableClient.class, StringClient.class, RestActivator.class)
-            .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addClasses(ReturnWith200RequestFilter.class, AutoCloseableClient.class,
+                        CloseableClient.class, StringClient.class, RestActivator.class)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
 
     @Inject
@@ -91,7 +92,7 @@ private <T extends StringClient> void checkClient(final Class<T> type) {
         resolved.destroy(client, ctx);
         // The bean has been destroyed, expect an IllegalStateException if the method is invoked per the specification
         Assert.expectThrows("Expected an IllegalStateException to be thrown", IllegalStateException.class,
-            client::executeGet);
+                client::executeGet);
     }
 
     @SuppressWarnings("unchecked")

diff --git a/...a/org/eclipse/microprofile/rest/client/tck/interfaces/cdi/scoped/AutoCloseableClient.java b/...a/org/eclipse/microprofile/rest/client/tck/interfaces/cdi/scoped/AutoCloseableClient.java
@@ -16,10 +16,11 @@
 
 package org.eclipse.microprofile.rest.client.tck.interfaces.cdi.scoped;
 
-import jakarta.ws.rs.Path;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+import jakarta.ws.rs.Path;
+
 @Path("/")
 // The host/port is hard-coded here as it is not currently used. The StringClientRequestFilter is used to abort the
 // request with a 200 response code.

diff --git a/...ain/java/org/eclipse/microprofile/rest/client/tck/interfaces/cdi/scoped/StringClient.java b/...ain/java/org/eclipse/microprofile/rest/client/tck/interfaces/cdi/scoped/StringClient.java
@@ -16,11 +16,12 @@
 
 package org.eclipse.microprofile.rest.client.tck.interfaces.cdi.scoped;
 
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
 /**
  * @author <a href="mailto:[email protected]">James R. Perkins</a>
  */