Skip to content

Commit 6cb657d

Browse files
committed
Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/datatables.net-bs5-1.13.6
# Conflicts: # package.json
2 parents 660b75c + 9dee242 commit 6cb657d

File tree

9 files changed

+16
-36
lines changed

9 files changed

+16
-36
lines changed

.github/workflows/check-md-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
markdown-link-check:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
- uses: gaurav-nelson/github-action-markdown-link-check@v1
1111
with:
1212
check-modified-files-only: 'no'

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: on ${{ matrix.platform }} with JDK ${{ matrix.jdk }}
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Set up JDK ${{ matrix.jdk }}
2929
uses: actions/setup-java@v3
3030
with:

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
- name: Setup Java
3434
uses: actions/setup-java@v3

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Coverage on Ubuntu
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Set up JDK 11
1919
uses: actions/setup-java@v3
2020
with:

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: micnncim/[email protected]
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mvn_exec_node

Whitespace-only changes.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,23 @@
88
"dependencies": {
99
"datatables.net": "1.13.6",
1010
"datatables.net-bs5": "1.13.6",
11-
"datatables.net-buttons-bs5": "2.4.1",
11+
"datatables.net-buttons-bs5": "2.4.2",
1212
"datatables.net-colreorder-bs5": "1.7.0",
1313
"datatables.net-responsive-bs5": "2.5.0",
1414
"datatables.net-select-bs5": "1.7.0",
1515
"datatables.mark.js": "2.1.0",
1616
"mark.js": "8.11.1",
17-
"luxon": "3.3.0"
17+
"luxon": "3.4.3"
1818
},
1919
"devDependencies": {
2020
"remark-cli": "11.0.0",
2121
"remark-lint": "9.1.2",
2222
"remark-preset-lint-recommended": "6.1.3"
2323
},
2424
"scripts": {
25-
"lint-md": "remark ."
25+
"lint-md": "remark .",
26+
"mvnbuild": "",
27+
"mvntest": ""
2628
},
2729
"remarkConfig": {
2830
"plugins": [

pom.xml

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jvnet.hudson.plugins</groupId>
66
<artifactId>analysis-pom</artifactId>
7-
<version>6.10.0</version>
7+
<version>6.12.0</version>
88
<relativePath />
99
</parent>
1010

@@ -115,33 +115,6 @@
115115
</filesets>
116116
</configuration>
117117
</plugin>
118-
<plugin>
119-
<groupId>com.github.eirslett</groupId>
120-
<artifactId>frontend-maven-plugin</artifactId>
121-
<version>1.13.4</version>
122-
<executions>
123-
<execution>
124-
<id>install node and npm</id>
125-
<goals>
126-
<goal>install-node-and-npm</goal>
127-
</goals>
128-
<phase>generate-resources</phase>
129-
<configuration>
130-
<nodeVersion>v18.12.0</nodeVersion>
131-
</configuration>
132-
</execution>
133-
<execution>
134-
<id>npm install</id>
135-
<goals>
136-
<goal>npm</goal>
137-
</goals>
138-
<phase>generate-resources</phase>
139-
<configuration>
140-
<arguments>install</arguments>
141-
</configuration>
142-
</execution>
143-
</executions>
144-
</plugin>
145118
<plugin>
146119
<groupId>org.apache.maven.plugins</groupId>
147120
<artifactId>maven-resources-plugin</artifactId>

release.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
git pull
4+
git push
5+
mvn -B clean release:prepare release:perform

0 commit comments

Comments
 (0)