Skip to content

Commit 66ed219

Browse files
uhafneruhafner
committed
Upgrade DataTables with Bootstrap 5 customization (JS and CSS).
Bump dependencies to: - "datatables.net-bs5": "^1.10.25", - "datatables.net-buttons-bs5": "^1.7.1", - "datatables.net-colreorder-bs5": "^1.5.4", - "datatables.net-responsive-bs5": "^2.2.8",
1 parent 2e5d776 commit 66ed219

File tree

7 files changed

+48
-109
lines changed

7 files changed

+48
-109
lines changed

‎package-lock.json‎

Lines changed: 20 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "data-tables",
3-
"version": "0.1.0",
3+
"version": "1.10.25",
44
"description": "JQuery DataTables Jenkins Plugin",
55
"directories": {
66
"doc": "doc"
77
},
88
"dependencies": {
9-
"datatables.net-bs4": "^1.10.24",
10-
"datatables.net-buttons-bs4": "^1.7.0",
11-
"datatables.net-colreorder-bs4": "^1.5.3",
12-
"datatables.net-responsive-bs4": "^2.2.7",
9+
"datatables.net-bs5": "^1.10.25",
10+
"datatables.net-buttons-bs5": "^1.7.1",
11+
"datatables.net-colreorder-bs5": "^1.5.4",
12+
"datatables.net-responsive-bs5": "^2.2.8",
1313
"remark-cli": "^6.0.1",
1414
"remark-lint": "^6.0.5",
1515
"remark-preset-lint-recommended": "^3.0.2"

‎pom.xml‎

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,15 @@
1818
<url>https://github.com/jenkinsci/data-tables-api-plugin</url>
1919

2020
<properties>
21-
<revision>1.10.24-1</revision>
21+
<revision>1.10.25-1</revision>
2222
<changelist>-SNAPSHOT</changelist>
23-
<datatables.version>1.10.24</datatables.version>
24-
25-
<datatables-responsive.version>2.2.7</datatables-responsive.version>
26-
<datatables-colreorder.version>1.5.2</datatables-colreorder.version>
27-
<datatables-buttons.version>1.7.0</datatables-buttons.version>
2823

2924
<module.name>${project.groupId}.datatables</module.name>
3025

3126
<jquery3-api.version>3.5.1-3</jquery3-api.version>
32-
<font-awesome-api.version>5.15.2-2</font-awesome-api.version>
33-
<bootstrap4-api.version>4.6.0-2</bootstrap4-api.version>
34-
<plugin-util-api.version>2.1.0</plugin-util-api.version>
27+
<font-awesome-api.version>5.15.3-2</font-awesome-api.version>
28+
<bootstrap5-api.version>5.0.1-1</bootstrap5-api.version>
29+
<plugin-util-api.version>2.2.0</plugin-util-api.version>
3530
</properties>
3631

3732
<licenses>
@@ -50,31 +45,6 @@
5045
</developers>
5146

5247
<dependencies>
53-
<dependency>
54-
<groupId>org.webjars</groupId>
55-
<artifactId>datatables</artifactId>
56-
<version>${datatables.version}</version>
57-
<scope>provided</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.webjars</groupId>
61-
<artifactId>datatables-responsive</artifactId>
62-
<version>${datatables-responsive.version}</version>
63-
<scope>provided</scope>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.webjars</groupId>
67-
<artifactId>datatables-colreorder</artifactId>
68-
<version>${datatables-colreorder.version}</version>
69-
<scope>provided</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.webjars</groupId>
73-
<artifactId>datatables-buttons</artifactId>
74-
<version>${datatables-buttons.version}</version>
75-
<scope>provided</scope>
76-
</dependency>
77-
7848
<!-- Jenkins Plugin Dependencies -->
7949
<dependency>
8050
<groupId>io.jenkins.plugins</groupId>
@@ -87,11 +57,13 @@
8757
</dependency>
8858
<dependency>
8959
<groupId>io.jenkins.plugins</groupId>
90-
<artifactId>bootstrap4-api</artifactId>
60+
<artifactId>bootstrap5-api</artifactId>
61+
<version>${bootstrap5-api.version}</version>
9162
</dependency>
9263
<dependency>
9364
<groupId>io.jenkins.plugins</groupId>
9465
<artifactId>font-awesome-api</artifactId>
66+
<version>${font-awesome-api.version}</version>
9567
</dependency>
9668
<dependency>
9769
<groupId>org.jenkins-ci.plugins</groupId>
@@ -157,31 +129,31 @@
157129
<filtering>false</filtering>
158130
</resource>
159131
<resource>
160-
<directory>${project.basedir}/node_modules/datatables.net-bs4/js</directory>
132+
<directory>${project.basedir}/node_modules/datatables.net-bs5/js</directory>
161133
<filtering>false</filtering>
162134
</resource>
163135
<resource>
164136
<directory>${project.basedir}/node_modules/datatables.net-buttons/js</directory>
165137
<filtering>false</filtering>
166138
</resource>
167139
<resource>
168-
<directory>${project.basedir}/node_modules/datatables.net-buttons-bs4/js</directory>
140+
<directory>${project.basedir}/node_modules/datatables.net-buttons-bs5/js</directory>
169141
<filtering>false</filtering>
170142
</resource>
171143
<resource>
172144
<directory>${project.basedir}/node_modules/datatables.net-colreorder/js</directory>
173145
<filtering>false</filtering>
174146
</resource>
175147
<resource>
176-
<directory>${project.basedir}/node_modules/datatables.net-colreorder-bs4/js</directory>
148+
<directory>${project.basedir}/node_modules/datatables.net-colreorder-bs5/js</directory>
177149
<filtering>false</filtering>
178150
</resource>
179151
<resource>
180152
<directory>${project.basedir}/node_modules/datatables.net-responsive/js</directory>
181153
<filtering>false</filtering>
182154
</resource>
183155
<resource>
184-
<directory>${project.basedir}/node_modules/datatables.net-responsive-bs4/js</directory>
156+
<directory>${project.basedir}/node_modules/datatables.net-responsive-bs5/js</directory>
185157
<filtering>false</filtering>
186158
</resource>
187159
</resources>
@@ -197,19 +169,19 @@
197169
<outputDirectory>${project.build.directory}/${project.artifactId}/css</outputDirectory>
198170
<resources>
199171
<resource>
200-
<directory>${project.basedir}/node_modules/datatables.net-bs4/css</directory>
172+
<directory>${project.basedir}/node_modules/datatables.net-bs5/css</directory>
201173
<filtering>false</filtering>
202174
</resource>
203175
<resource>
204-
<directory>${project.basedir}/node_modules/datatables.net-buttons-bs4/css</directory>
176+
<directory>${project.basedir}/node_modules/datatables.net-buttons-bs5/css</directory>
205177
<filtering>false</filtering>
206178
</resource>
207179
<resource>
208-
<directory>${project.basedir}/node_modules/datatables.net-colreorder-bs4/css</directory>
180+
<directory>${project.basedir}/node_modules/datatables.net-colreorder-bs5/css</directory>
209181
<filtering>false</filtering>
210182
</resource>
211183
<resource>
212-
<directory>${project.basedir}/node_modules/datatables.net-responsive-bs4/css</directory>
184+
<directory>${project.basedir}/node_modules/datatables.net-responsive-bs5/css</directory>
213185
<filtering>false</filtering>
214186
</resource>
215187
</resources>

‎src/main/resources/io/jenkins/plugins/data-tables-buttons.jelly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Use it like <st:adjunct includes="io.jenkins.plugins.data-tables-buttons"/>
1111
<st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
1212
<st:adjunct includes="io.jenkins.plugins.data-tables"/>
1313

14-
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/buttons.bootstrap4.min.css"/>
14+
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/buttons.bootstrap5.min.css"/>
1515

1616
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.buttons.min.js"/>
17-
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/buttons.bootstrap4.min.js"/>
17+
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/buttons.bootstrap5.min.js"/>
1818

1919
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/buttons.colVis.min.js"/>
2020
</j:jelly>

‎src/main/resources/io/jenkins/plugins/data-tables-colreorder.jelly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Use it like <st:adjunct includes="io.jenkins.plugins.data-tables-colreorder"/>
1111
<st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
1212
<st:adjunct includes="io.jenkins.plugins.data-tables"/>
1313

14-
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/colReorder.bootstrap4.min.css"/>
14+
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/colReorder.bootstrap5.min.css"/>
1515

1616
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.colReorder.min.js"/>
17-
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/colReorder.bootstrap4.min.js"/>
17+
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/colReorder.bootstrap5.min.js"/>
1818

1919
</j:jelly>

‎src/main/resources/io/jenkins/plugins/data-tables-responsive.jelly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Use it like <st:adjunct includes="io.jenkins.plugins.data-tables-responsive"/>
1111
<st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
1212
<st:adjunct includes="io.jenkins.plugins.data-tables"/>
1313

14-
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/responsive.bootstrap4.min.css"/>
14+
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/responsive.bootstrap5.min.css"/>
1515

1616
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.responsive.min.js"/>
17-
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/responsive.bootstrap4.min.js"/>
17+
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/responsive.bootstrap5.min.js"/>
1818

1919
</j:jelly>

‎src/main/resources/io/jenkins/plugins/data-tables.jelly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Use it like <st:adjunct includes="io.jenkins.plugins.data-tables"/>
1010
<st:adjunct includes="io.jenkins.plugins.jquery3"/>
1111
<st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
1212

13-
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/dataTables.bootstrap4.min.css"/>
13+
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/dataTables.bootstrap5.min.css"/>
1414
<link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/jenkins-style.css"/>
1515

1616
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/jquery.dataTables.min.js"/>
17-
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.bootstrap4.min.js"/>
17+
<script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.bootstrap5.min.js"/>
1818

1919
</j:jelly>

0 commit comments

Comments
 (0)