Skip to content

Commit 6c07fff

Browse files
jeongm-inmattrpav
jeongm-in
authored and
mattrpav
committed
chore: Update node to 20; Update action script; Addess build warnings
1 parent 36f1073 commit 6c07fff

34 files changed

+1155
-968
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
build-main:
99
if: ${{ github.repository == 'atlasmap/atlasmap' }}
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111
env:
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1313
steps:
@@ -34,6 +34,8 @@ jobs:
3434
restore-keys: |
3535
${{ runner.os }}-maven-
3636
- name: Build
37+
env:
38+
NODE_OPTIONS: --openssl-legacy-provider
3739
run: mvn --batch-mode -X -Pcoverage -Dwebdriver.chrome.driver=${{ steps.setup_chrome.outputs.chromedriver-path }} clean install
3840

3941
- name: Publish docs

‎.github/workflows/supported-build.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
java: [ '17' ]
20-
os: [ubuntu-latest, macos-13, windows-latest]
20+
os: [ubuntu-24.04, macos-13, windows-2022]
2121
name: ${{ matrix.os }}/Java${{ matrix.java }}
2222
steps:
2323
- uses: actions/checkout@v4
@@ -37,6 +37,8 @@ jobs:
3737
restore-keys: |
3838
${{ runner.os }}-maven-
3939
- name: Build from root with Maven
40+
env:
41+
NODE_OPTIONS: --openssl-legacy-provider
4042
run: mvn --batch-mode -Pcoverage "-Dwebdriver.chrome.driver=${{ steps.setup_chrome.outputs.chromedriver-path }}" clean install
4143
- name: Build lib with Maven
4244
working-directory: lib
@@ -52,10 +54,10 @@ jobs:
5254
chromatic:
5355
needs: build_maven
5456
if: |
55-
github.repository == 'atlasmap/atlasmap'
56-
&& github.actor != 'dependabot[bot]'
57-
&& github.actor != 'dependabot'
58-
runs-on: ubuntu-latest
57+
github.repository == 'atlasmap/atlasmap'
58+
&& github.actor != 'dependabot[bot]'
59+
&& github.actor != 'dependabot'
60+
runs-on: ubuntu-24.04
5961
steps:
6062
- uses: actions/checkout@v4
6163
with:
@@ -85,4 +87,4 @@ jobs:
8587
token: ${{ secrets.GITHUB_TOKEN }}
8688
projectToken: adaaa25c3df8
8789
workingDir: ui/packages/atlasmap
88-
buildScriptName: build:storybook
90+
buildScriptName: build:storybook

‎atlasmap-maven-plugin/tests/src/test/resources/fhir-patient.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
3636
-->
3737
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://hl7.org/fhir" xmlns:xhtml="http://www.w3.org/1999/xhtml" targetNamespace="http://hl7.org/fhir" elementFormDefault="qualified" version="1.0">
38-
<xs:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="http://www.hl7.org/implement/standards/fhir/fhir-xhtml.xsd"/>
38+
<xs:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="https://hl7.org/fhir/R5/fhir-xhtml.xsd"/>
3939

4040
<xs:simpleType name="date-primitive">
4141
<xs:restriction>

‎checkstyle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<property name="scope" value="public"/>
126126
</module>
127127
<module name="JavadocMethod">
128-
<property name="scope" value="public"/>
128+
<property name="accessModifiers" value="public"/>
129129
</module>
130130
<module name="JavadocVariable">
131131
<property name="scope" value="nothing"/>

‎docs/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@
304304
<backend>html5</backend>
305305
<doctype>book</doctype>
306306
<preserveDirectories>true</preserveDirectories>
307-
<sourceHighlighter>coderay</sourceHighlighter>
308307
<attributes>
309308
<imagesdir>images</imagesdir>
310309
<toc>left</toc>
311310
<linkcss>false</linkcss>
311+
<sourceHighlighter>coderay</sourceHighlighter>
312312
</attributes>
313313
</configuration>
314314
</execution>
@@ -324,11 +324,11 @@
324324
<backend>html5</backend>
325325
<doctype>book</doctype>
326326
<preserveDirectories>true</preserveDirectories>
327-
<sourceHighlighter>coderay</sourceHighlighter>
328327
<attributes>
329328
<imagesdir>images</imagesdir>
330329
<toc>left</toc>
331330
<linkcss>false</linkcss>
331+
<sourceHighlighter>coderay</sourceHighlighter>
332332
</attributes>
333333
</configuration>
334334
</execution>
@@ -362,9 +362,9 @@
362362
<sourceDocumentName>index.adoc</sourceDocumentName>
363363
<outputDirectory>${project.build.directory}/generated-docs/pdf/user-guide</outputDirectory>
364364
<backend>pdf</backend>
365-
<sourceHighlighter>rouge</sourceHighlighter>
366365
<attributes>
367366
<toc />
367+
<sourceHighlighter>rouge</sourceHighlighter>
368368
</attributes>
369369
</configuration>
370370
</execution>
@@ -379,9 +379,9 @@
379379
<sourceDocumentName>index.adoc</sourceDocumentName>
380380
<outputDirectory>${project.build.directory}/generated-docs/pdf/developer-guide</outputDirectory>
381381
<backend>pdf</backend>
382-
<sourceHighlighter>rouge</sourceHighlighter>
383382
<attributes>
384383
<toc />
384+
<sourceHighlighter>rouge</sourceHighlighter>
385385
</attributes>
386386
</configuration>
387387
</execution>

‎lib/dist/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
</goals>
6767
<configuration>
6868
<appendAssemblyId>false</appendAssemblyId>
69-
<finalName>aggregated</finalName>
7069
<descriptors>
7170
<descriptor>${basedir}/assembly-aggregate.xml</descriptor>
7271
</descriptors>

‎lib/itests/core/src/test/resources/data/issue/atlasmap-3549-source1.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
{
2-
"methodName": "GetBalanceAndDate",
3-
"params": [
4-
{
5-
"paramString": {
6-
"fieldName": "stringFieldName",
7-
"value": {
8-
"string": "abc"
9-
}
10-
},
11-
"paramBoolean": {
12-
"fieldName": "booleanFieldName",
13-
"value": {
14-
"boolean": true
15-
}
16-
},
17-
"paramDatetime": {
18-
"fieldName": "dateTimeFieldName",
19-
"value": {
20-
"dateTime.iso8601": "20070925T21:36:59+0530"
21-
}
22-
}
23-
}
24-
]
1+
{
2+
"methodName": "GetBalanceAndDate",
3+
"params": [
4+
{
5+
"paramString": {
6+
"fieldName": "stringFieldName",
7+
"value": {
8+
"string": "abc"
9+
}
10+
},
11+
"paramBoolean": {
12+
"fieldName": "booleanFieldName",
13+
"value": {
14+
"boolean": true
15+
}
16+
},
17+
"paramDatetime": {
18+
"fieldName": "dateTimeFieldName",
19+
"value": {
20+
"dateTime.iso8601": "20070925T21:36:59+0530"
21+
}
22+
}
23+
}
24+
]
2525
}

‎lib/itests/core/src/test/resources/data/issue/atlasmap-3549-source2.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{
2-
"methodName": "GetBalanceAndDate",
3-
"params": [
4-
{
5-
"paramString": {
6-
"fieldName": "abc1",
7-
"value": {
8-
"string": "xmyya"
9-
}
10-
}
11-
},
12-
{
13-
"paramBoolean": {
14-
"fieldName": "booleanParamFieldName",
15-
"value": {
16-
"boolean": true
17-
}
18-
}
19-
}
20-
]
1+
{
2+
"methodName": "GetBalanceAndDate",
3+
"params": [
4+
{
5+
"paramString": {
6+
"fieldName": "abc1",
7+
"value": {
8+
"string": "xmyya"
9+
}
10+
}
11+
},
12+
{
13+
"paramBoolean": {
14+
"fieldName": "booleanParamFieldName",
15+
"value": {
16+
"boolean": true
17+
}
18+
}
19+
}
20+
]
2121
}

0 commit comments

Comments
 (0)