Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

APPSERV-59 Adds MicroProfile 2.3 profile #103

Merged
merged 4 commits into from
Apr 3, 2020
Merged

APPSERV-59 Adds MicroProfile 2.3 profile #103

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f793f1d
APPSERV-59 adds MicroProfile 2.3 profile
jbee Mar 20, 2020
c3739d8
APPSERV-59 adds 2.3 profile
jbee Mar 31, 2020
ee8cb54
APPSERV-59 adds profile MP 2.2
jbee Apr 2, 2020
90dc18d
APPSERV-59 fixes profile regex and CDI api version
jbee Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 58 additions & 4 deletions MicroProfile-Metrics/tck-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -145,7 +164,7 @@
<activation>
<property>
<name>payara.version</name>
<value>/^5\.193(\.\d*)?(-SNAPSHOT)?/</value>
<value>/5\.193.*/</value>
</property>
</activation>
<properties>
Expand All @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably retain the possibility of having -SNAPSHOT at the end due to stability stream / enterprise.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't the .* allow that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd have thought so but there seems to be something wrong with the regex (which isn't obvious to me)

mvn help:active-profiles  -Dpayara.version=5.201-SNAPSHOT -am -pl MicroProfile-Metrics/tck-runner ---> mp-metrics-2.2

mvn help:active-profiles  -Dpayara.version=5.201.1-SNAPSHOT -am -pl MicroProfile-Metrics/tck-runner ---> Error (same as below - no property version found)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can only assume this is due to the illegal regex provided in the other profile (missed / in the start). I tested this after that was corrected and it worked. Another issue was that the CDI api version 2.0.2 was incorrect.

</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>
Expand Down