Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7fa1bd6

Browse files
bodewigbodewig
authored
Merge pull request #291 from xmlunit/extend-circle-ci
Extend CircleCI
2 parents 67a458e + 88004a8 commit 7fa1bd6

File tree

3 files changed

+119
-10
lines changed

3 files changed

+119
-10
lines changed

‎.circleci/config.yml‎

Lines changed: 104 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,126 @@
11
version: 2.1
22
orbs:
33
coveralls: coveralls/[email protected]
4-
jobs:
5-
test-java:
6-
docker:
7-
- image: cimg/openjdk:17.0
4+
5+
parameters:
6+
xmlunit-version:
7+
type: string
8+
default: "2.10.1-SNAPSHOT"
9+
10+
commands:
11+
full-checkout:
812
steps:
913
- checkout
1014
- run: git submodule sync
1115
- run: git submodule update --init
16+
initialize-cache:
17+
steps:
1218
- run:
1319
name: Calculate cache key
1420
command: |-
1521
find . -name 'pom.xml' -o -name 'gradlew*' -o -name '*.gradle*' | \
1622
sort | xargs cat > /tmp/CIRCLECI_CACHE_KEY
1723
- restore_cache:
1824
key: cache-{{ checksum "/tmp/CIRCLECI_CACHE_KEY" }}
19-
- run:
20-
command: mvn verify -Pjacoco org.jacoco:jacoco-maven-plugin:report com.github.hazendaz.maven:coveralls-maven-plugin:report
21-
- store_test_results:
22-
path: target/surefire-reports
25+
persist-cache:
26+
steps:
2327
- save_cache:
2428
key: cache-{{ checksum "/tmp/CIRCLECI_CACHE_KEY" }}
2529
paths:
2630
- ~/.m2/repository
31+
32+
executors:
33+
openjdk:
34+
parameters:
35+
version:
36+
description: "version tag"
37+
default: "17.0"
38+
type: string
39+
docker:
40+
- image: cimg/openjdk:<<parameters.version>>
41+
42+
jobs:
43+
test-with-coverage:
44+
docker:
45+
- image: cimg/openjdk:17.0
46+
steps:
47+
- full-checkout
48+
- initialize-cache
49+
- run:
50+
command: mvn verify -Pjacoco org.jacoco:jacoco-maven-plugin:report com.github.hazendaz.maven:coveralls-maven-plugin:report
51+
- store_test_results:
52+
path: target/surefire-reports
53+
- persist-cache
2754
- coveralls/upload
55+
56+
test-only:
57+
parameters:
58+
version:
59+
description: "version tag"
60+
default: "17.0"
61+
type: string
62+
executor:
63+
name: openjdk
64+
version: <<parameters.version>>
65+
steps:
66+
- full-checkout
67+
- initialize-cache
68+
- run:
69+
command: mvn test
70+
- store_test_results:
71+
path: target/surefire-reports
72+
- persist-cache
73+
74+
compat-tests:
75+
docker:
76+
- image: cimg/openjdk:17.0
77+
environment:
78+
VERSION: << pipeline.parameters.xmlunit-version >>
79+
steps:
80+
- full-checkout
81+
- initialize-cache
82+
- run:
83+
command: mvn install -DskipTests=true
84+
- run:
85+
working_directory: compat-tests
86+
command: ./assertj-test.sh ${VERSION} 3.9.1 only-assertj
87+
- run:
88+
working_directory: compat-tests
89+
command: ./assertj-test.sh ${VERSION} 3.13.2 only-assertj
90+
- run:
91+
working_directory: compat-tests
92+
command: ./assertj-test.sh ${VERSION} 3.15.0 only-assertj
93+
- run:
94+
working_directory: compat-tests
95+
command: ./assertj-test.sh ${VERSION} 3.19.0 both
96+
- run:
97+
working_directory: compat-tests
98+
command: ./assertj-test.sh ${VERSION} 3.20.2 both
99+
- run:
100+
working_directory: compat-tests
101+
command: ./jaxb-test.sh ${VERSION} javax
102+
- run:
103+
working_directory: compat-tests
104+
command: ./jaxb-test.sh ${VERSION} jakarta
105+
- run:
106+
working_directory: compat-tests
107+
command: ./hamcrest-test.sh ${VERSION} 2.2
108+
28109
workflows:
29110
build-and-test:
30111
jobs:
31-
- test-java
112+
- test-with-coverage
113+
- compat-tests:
114+
requires:
115+
- test-with-coverage
116+
- test-only:
117+
requires:
118+
- compat-tests
119+
matrix:
120+
parameters:
121+
version:
122+
- "8.0"
123+
- "11.0"
124+
- "14.0"
125+
- "17.0"
126+
- "21.0"

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## XMLUnit for Java 2.10.1 - /not released, yet/
44

5+
* updated bytebuddy dependency of xmlunit-assertj to 2.12.23 in order
6+
to support Java 17 properly
7+
58
* Migrated form TraciCI to CircleCI
69
Issue [#289](https://github.com/xmlunit/xmlunit/pull/289)
710

‎pom.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<junit.version>4.13.1</junit.version>
6262
<mockito.version>2.1.0</mockito.version>
6363
<assertj.version>2.9.0</assertj.version>
64-
<byte-buddy.version>1.10.10</byte-buddy.version>
64+
<byte-buddy.version>1.12.23</byte-buddy.version>
6565

6666
<!-- Jakarta XML Binding version -->
6767
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
@@ -611,5 +611,16 @@
611611
</dependencies>
612612
</dependencyManagement>
613613
</profile>
614+
<profile>
615+
<id>java21+</id>
616+
<activation>
617+
<activeByDefault>false</activeByDefault>
618+
<jdk>[21,)</jdk>
619+
</activation>
620+
<properties>
621+
<maven.compile.source>8</maven.compile.source>
622+
<maven.compile.target>8</maven.compile.target>
623+
</properties>
624+
</profile>
614625
</profiles>
615626
</project>

0 commit comments

Comments
 (0)