Skip to content

Commit 432dc02

Browse files
bitcoderbitcoder
authored
XMP-596 update deps including support for junit 5.14. x (#98)
* bump pom deps; fix #96 * removed JDK 8 compat * removed compat with JDK 11 * XMP-596 fix deprecated methods * bump okhttp dep and cleanup workflow * code cleanup * build on latest LTS JDK, 25 * XMP-596 build on latest LTS JDK, 25
1 parent 1a8f532 commit 432dc02

12 files changed

Lines changed: 144 additions & 29 deletions

File tree

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
java: [ '8', '11', '17', '21' ]
23+
java: [ '17', '21', '25' ]
2424

2525
steps:
2626
- uses: actions/checkout@v4

‎.github/workflows/publish-plugin.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
cache: maven
3030
# gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} # Value of the GPG private key to import
3131
# gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
32-
- name: debug maven settings
33-
run: |
34-
cat ~/.m2/settings.xml
3532
- id: install-secret-key
3633
name: Install gpg secret key
3734
run: |

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Fixed
1313

14+
## [0.10.0] - 2025-11-12
15+
16+
### Added
17+
18+
- fixes #94 (bump deps) by @bitcoder in #95
19+
1420
## [0.9.0] - 2025-05-06
1521

1622
### Added

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Add the following dependency to your pom.xml, where the `<configuration>` is opt
3737
<plugin>
3838
<groupId>app.getxray</groupId>
3939
<artifactId>xray-maven-plugin</artifactId>
40-
<version>0.9.0</version>
40+
<version>0.10.0</version>
4141
<scope>test</scope>
4242
<configuration>
4343
<clientId>215FFD69FE46447280000000000</clientId>

‎pom.xml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>app.getxray</groupId>
55
<artifactId>xray-maven-plugin</artifactId>
6-
<version>0.9.0</version>
6+
<version>0.10.0</version>
77
<packaging>maven-plugin</packaging>
88
<name>xray-maven-plugin</name>
99
<description>Maven plugin for interacting with Xray (server/datacenter and cloud), used in CI/CD for assisting in test automation flows, such as reporting test results back to Xray and, by consequence, Jira.</description>
@@ -38,23 +38,23 @@
3838
</scm>
3939

4040
<properties>
41-
<maven.compiler.target>1.8</maven.compiler.target>
42-
<maven.compiler.source>1.8</maven.compiler.source>
41+
<maven.compiler.release>17</maven.compiler.release>
42+
<maven.compiler.target>17</maven.compiler.target>
43+
<maven.compiler.source>17</maven.compiler.source>
4344
<maven-plugin-api.version>3.8.5</maven-plugin-api.version>
4445
<maven-plugin-annotations.version>3.6.4</maven-plugin-annotations.version>
4546
<maven-project.version>2.2.1</maven-project.version>
4647
<maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
4748
<maven-site-plugin.version>3.12.0</maven-site-plugin.version>
48-
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
49-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
49+
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
50+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
5051
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
5152
<mockito.version>4.11.0</mockito.version>
5253
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
5354
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5455
<itf.version>0.13.1</itf.version>
55-
<junit.version>5.12.2</junit.version>
56-
<junit-platform.version>1.12.2</junit-platform.version>
57-
<jacoco.version>0.8.13</jacoco.version>
56+
<junit.version>5.14.1</junit.version>
57+
<jacoco.version>0.8.14</jacoco.version>
5858
<internal.xray-maven-plugin.version>0.8.0</internal.xray-maven-plugin.version>
5959
<unit.coverage.file>${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</unit.coverage.file>
6060
<it.coverage.file>${project.build.directory}/jacoco-output/jacoco-it-tests.exec</it.coverage.file>
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>com.squareup.okhttp3</groupId>
9999
<artifactId>okhttp</artifactId>
100-
<version>4.9.3</version>
100+
<version>4.12.0</version>
101101
</dependency>
102102

103103
<dependency>
@@ -161,7 +161,7 @@
161161
<dependency>
162162
<groupId>app.getxray</groupId>
163163
<artifactId>xray-junit-extensions</artifactId>
164-
<version>0.7.2</version>
164+
<version>1.0.0</version>
165165
<scope>test</scope>
166166
</dependency>
167167

@@ -290,7 +290,9 @@
290290
</excludes>
291291

292292
<testFailureIgnore>false</testFailureIgnore>
293-
<disableXmlReport>true</disableXmlReport>
293+
<statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
294+
<disable>true</disable>
295+
</statelessTestsetReporter>
294296
<useFile>false</useFile>
295297
</configuration>
296298
</plugin>
@@ -345,10 +347,10 @@
345347
<!--
346348
check if the following ones are actually needed or not to run the integration tests
347349
-->
348-
<systemProperties>
350+
<systemPropertyVariables>
349351
<maven.version>${maven.version}</maven.version>
350352
<maven.home>${maven.home}</maven.home>
351-
</systemProperties>
353+
</systemPropertyVariables>
352354

353355
<argLine>${failsafe.jacoco.args}</argLine>
354356
<includes>

‎src/test/java/app/getxray/xray/CloudCustomDisplayNameGenerator.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package app.getxray.xray;
22

33
import java.lang.reflect.Method;
4+
import java.util.List;
5+
46
import org.junit.jupiter.api.DisplayNameGenerator.Standard;
57

68
public class CloudCustomDisplayNameGenerator extends Standard {
@@ -11,12 +13,12 @@ public String generateDisplayNameForClass(Class<?> testClass) {
1113
}
1214

1315
@Override
14-
public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
15-
return replaceCamelCase(replaceUndercoreBySpace(super.generateDisplayNameForNestedClass(nestedClass)));
16+
public String generateDisplayNameForNestedClass(List<Class<?>> enclosingInstanceTypes, Class<?> nestedClass) {
17+
return replaceCamelCase(replaceUndercoreBySpace(super.generateDisplayNameForNestedClass(null, nestedClass)));
1618
}
1719

1820
@Override
19-
public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
21+
public String generateDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod) {
2022
return this.replaceCamelCase(replaceUndercoreBySpace(testMethod.getName())) + " (cloud)";
2123
}
2224

‎src/test/java/app/getxray/xray/DCCustomDisplayNameGenerator.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package app.getxray.xray;
22

33
import java.lang.reflect.Method;
4+
import java.util.List;
5+
46
import org.junit.jupiter.api.DisplayNameGenerator.Standard;
57

68
public class DCCustomDisplayNameGenerator extends Standard {
@@ -11,12 +13,12 @@ public String generateDisplayNameForClass(Class<?> testClass) {
1113
}
1214

1315
@Override
14-
public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
15-
return replaceCamelCase(replaceUndercoreBySpace(super.generateDisplayNameForNestedClass(nestedClass)));
16+
public String generateDisplayNameForNestedClass(List<Class<?>> enclosingInstanceTypes, Class<?> nestedClass) {
17+
return replaceCamelCase(replaceUndercoreBySpace(super.generateDisplayNameForNestedClass(enclosingInstanceTypes, nestedClass)));
1618
}
1719

1820
@Override
19-
public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
21+
public String generateDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod) {
2022
return this.replaceCamelCase(replaceUndercoreBySpace(testMethod.getName())) + " (DC)";
2123
}
2224

‎src/test/java/app/getxray/xray/it/export_features/XrayDatacenterIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public class XrayDatacenterIT {
3737

3838
static WireMockServer wm;
3939
@BeforeAll
40-
public static void setup () {
40+
static void setup () {
4141
wm = new WireMockServer(options().port(PORT_NUMBER));
4242
wm.start();
4343
setupStub();
4444
}
4545

4646
@AfterAll
47-
public static void teardown () {
47+
static void teardown () {
4848
wm.stop();
4949
}
5050

‎src/test/java/app/getxray/xray/it/import_features/XrayCloudIT.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.junit.jupiter.api.DisplayNameGeneration;
2727

2828
import com.github.tomakehurst.wiremock.WireMockServer;
29-
import com.github.tomakehurst.wiremock.client.BasicCredentials;
3029
import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
3130
import com.soebes.itf.jupiter.extension.MavenGoal;
3231
import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
@@ -256,7 +255,7 @@ void multiple_features_from_directory(MavenExecutionResult result) throws IOExce
256255
ServeEvent request = allServeEvents.get(0);
257256
byte[] zippedContent = request.getRequest().getPart("file").getBody().asBytes();
258257
InputStream zippedContentStream = new ByteArrayInputStream(zippedContent);
259-
unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath().toString());
258+
unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath());
260259
assertThat(tempDir.listFiles()).hasSize(2);
261260
assertThat(tempDir.listFiles()).extracting(File::getName).containsExactlyInAnyOrder("core", "other");
262261
assertThat((new File(tempDir, "core")).listFiles()).extracting(File::getName).containsExactlyInAnyOrder("positive_sum.feature");

‎src/test/java/app/getxray/xray/it/import_results/XrayCloudIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private static void setupStub() {
159159
@SystemProperty(value = "xray.verbose", content = "true")
160160
@MavenOption("--debug")
161161
@Requirement("XMP-132")
162-
void xray_standard_with_verbose_mode(MavenExecutionResult result) throws IOException {
162+
void xray_standard_with_verbose_mode(MavenExecutionResult result) {
163163
assertThat(result).isSuccessful();
164164
assertThat(result)
165165
.out()

0 commit comments

Comments
 (0)