From 5cff11b5a177634378501de5ad40fc197fac3f9d Mon Sep 17 00:00:00 2001
From: Jan Bernitt <jaanbernitt@gmail.com>
Date: Fri, 3 Apr 2020 12:51:46 +0200
Subject: [PATCH] APPSERV-59 Adds MicroProfile 2.3 profile (#103)

* APPSERV-59 adds MicroProfile 2.3 profile

* APPSERV-59 adds 2.3 profile

* APPSERV-59 adds profile MP 2.2

* APPSERV-59 fixes profile regex and CDI api version
---
 MicroProfile-Metrics/tck-runner/pom.xml | 62 +++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/MicroProfile-Metrics/tck-runner/pom.xml b/MicroProfile-Metrics/tck-runner/pom.xml
index 9366de54..d92bbe18 100644
--- a/MicroProfile-Metrics/tck-runner/pom.xml
+++ b/MicroProfile-Metrics/tck-runner/pom.xml
@@ -2,7 +2,7 @@
 <!--
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   
-   Copyright (c) [2017-2018] Payara Foundation and/or its affiliates. All rights reserved.
+   Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
   
    The contents of this file are subject to the terms of either the GNU
    General Public License Version 2 only ("GPL") or the Common Development
@@ -56,8 +56,8 @@
 
     <properties>
         <!-- Metrics Dependencies -->
-    	<microprofile.metrics.version>2.2.payara-p1</microprofile.metrics.version>
-    	<microprofile.metrics.tck.version>2.2.payara-p1</microprofile.metrics.tck.version>
+    	<microprofile.metrics.version>2.3</microprofile.metrics.version>
+    	<microprofile.metrics.tck.version>2.3</microprofile.metrics.tck.version>
 
     	<!-- Other Test Dependencies -->
     	<cdi.version>2.0</cdi.version>
@@ -119,6 +119,25 @@
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Metrics version     ${microprofile.metrics.version}</echo>
+                                <echo>Metrics TCK version ${microprofile.metrics.tck.version}</echo>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -145,7 +164,7 @@
             <activation>
                 <property>
                     <name>payara.version</name>
-                    <value>/^5\.193(\.\d*)?(-SNAPSHOT)?/</value>
+                    <value>/5\.193.*/</value>
                 </property>
             </activation>
             <properties>
@@ -157,6 +176,41 @@
                 <cdi.version>2.0</cdi.version>
             </properties>
         </profile>
+        <profile>
+            <id>mp-metrics-2.2</id>
+            <activation>
+                <property>
+                    <name>payara.version</name>
+                    <value>/5\.194.*|5\.201.*/</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Metrics Dependencies -->
+                <microprofile.metrics.version>2.2.payara-p1</microprofile.metrics.version>
+                <microprofile.metrics.tck.version>2.2.payara-p1</microprofile.metrics.tck.version>
+
+                <!-- Other Test Dependencies -->
+                <cdi.version>2.0</cdi.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>mp-metrics-2.3</id>
+            <activation>
+                <property>
+                    <name>payara.version</name>
+                    <value>/5\.20[^1].*/</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Metrics Dependencies -->
+                <microprofile.metrics.version>2.3</microprofile.metrics.version>
+                <microprofile.metrics.tck.version>2.3</microprofile.metrics.tck.version>
+
+                <!-- Other Test Dependencies -->
+                <cdi.version>2.0.SP1</cdi.version>
+            </properties>
+        </profile>
+
 
         <profile>
             <id>payara-server-managed</id>