Merge pull request #350 from Emily-Jiang/prep-for-mp6

Consume the parent pom version 2.6 and prepare for MP 6.0
eclipse · Sep 22, 2022 · e0eb681 · e0eb681
2 parents 4fd79ab + 7b56136
commit e0eb681
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -56,6 +56,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <version>7.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.microprofile</groupId>
         <artifactId>microprofile-parent</artifactId>
-        <version>2.4</version>
+        <version>2.6</version>
     </parent> 
 
     <groupId>org.eclipse.microprofile.rest.client</groupId>
@@ -35,6 +35,7 @@
     <properties>
         <version.mp.config>3.0</version.mp.config>
         <inceptionYear>2017</inceptionYear>
+        <version.microprofile.tck.bom>2.6</version.microprofile.tck.bom>
     </properties>
 
     <dependencyManagement>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -31,6 +31,18 @@
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9_]*$</checkstyle.methodNameFormat>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.eclipse.microprofile</groupId>
+                <artifactId>microprofile-tck-bom</artifactId>
+                <version>${version.microprofile.tck.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile.rest.client</groupId>

diff --git a/...ain/java/org/eclipse/microprofile/rest/client/tck/interfaces/ClientHeaderParamClient.java b/...ain/java/org/eclipse/microprofile/rest/client/tck/interfaces/ClientHeaderParamClient.java
@@ -79,11 +79,10 @@ public interface ClientHeaderParamClient {
     String methodRequiredComputeMethodFails();
 
     @GET
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     // something in the parent pom is forcing these lines to merged into one line, which is longer than 150 characters
-    @ClientHeaderParam(name = "MultiValueInvokedFromAnotherClass",
-                       value = "{org.eclipse.microprofile.rest.client.tck.ext.HeaderGenerator.generateHeader}")
-    //CHECKSTYLE:OFF
+    @ClientHeaderParam(name = "MultiValueInvokedFromAnotherClass", value = "{org.eclipse.microprofile.rest.client.tck.ext.HeaderGenerator.generateHeader}")
+    // CHECKSTYLE:OFF
     String methodComputeMultiValuedHeaderFromOtherClass();
 
     default String computeForInterface() {