Skip to content

Commit aeab054

Browse files
committed
work
1 parent 7ecdd73 commit aeab054

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

docker-start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
22

3-
./mvnw docker-compose:up
3+
systemctl stop postgresql
44

5+
./mvnw docker-compose:up

docker-stop.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22

33
./mvnw docker-compose:down
44

5+
systemctl start postgresql

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,20 @@
9999
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
100100

101101
<!-- Webjars -->
102+
<!--
102103
<webjars.bootstrap.version>4.5.3</webjars.bootstrap.version>
103104
<webjars.jquery.version>3.5.1</webjars.jquery.version>
104105
<webjars.popper.js.version>1.16.1</webjars.popper.js.version>
105106
<webjars.font-awesome.version>5.15.1</webjars.font-awesome.version>
106107
<webjars.ckeditor.version>18.0.0</webjars.ckeditor.version>
108+
-->
109+
110+
<!-- Webjars -->
111+
<webjars.jquery.version>3.6.0</webjars.jquery.version>
112+
<webjars.popper.js.version>2.9.3</webjars.popper.js.version>
113+
<webjars.bootstrap.version>5.1.3</webjars.bootstrap.version>
114+
<webjars.font-awesome.version>6.1.0</webjars.font-awesome.version>
115+
<webjars.ckeditor.version>31.0.0</webjars.ckeditor.version>
107116

108117
<!-- Frontend Server Site: Thymeleaf Templates -->
109118
<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>

src/main/resources/templates/layout/page.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<meta name="author" content="Thomas Woehlke">
1414
<meta name="description" content="Your Todo-List for Getting Things Done.">
1515
<title th:replace="${headtitle}">SimpleWorklist</title>
16-
<link th:href="@{/webjars/bootstrap/4.5.3/dist/css/bootstrap.min.css}" rel="stylesheet"/>
17-
<link th:href="@{/webjars/font-awesome/5.15.1/css/all.min.css}" rel="stylesheet"/>
16+
<link th:href="@{/webjars/bootstrap/>5.1.3/dist/css/bootstrap.min.css}" rel="stylesheet"/>
17+
<link th:href="@{/webjars/font-awesome/6.1.0/css/all.min.css}" rel="stylesheet"/>
1818
<link href="https://fonts.googleapis.com/css?family=Lato|Varela+Round" rel="stylesheet">
1919
<link th:href="@{/css/main.css}" rel="stylesheet"/>
2020
<!--/* Per-page placeholder for additional links */-->
@@ -71,11 +71,11 @@
7171
</nav>
7272
</footer>
7373
<script th:src="@{/js/google-analytics.js}"></script>
74-
<script th:src="@{/webjars/jquery/3.5.1/jquery.js}"></script>
75-
<script th:src="@{/webjars/popper.js/1.16.1/dist/umd/popper.min.js}"></script>
76-
<script th:src="@{/webjars/bootstrap/4.5.3/dist/js/bootstrap.bundle.js}"></script>
77-
<script th:src="@{/webjars/font-awesome/5.15.1/js/all.js}"></script>
78-
<script th:src="@{/webjars/ckeditor/18.0.0/classic/ckeditor.js}"></script>
74+
<script th:src="@{/webjars/jquery/3.9.3/jquery.js}"></script>
75+
<script th:src="@{/webjars/popper.js/2.9.3/dist/umd/popper.min.js}"></script>
76+
<script th:src="@{/webjars/bootstrap/5.1.3/dist/js/bootstrap.bundle.js}"></script>
77+
<script th:src="@{/webjars/font-awesome/6.1.0/js/all.js}"></script>
78+
<script th:src="@{/webjars/ckeditor/31.0.0/classic/ckeditor.js}"></script>
7979
<script th:inline="javascript">
8080
ClassicEditor
8181
.create( document.querySelector( '#textEditor' ) )

0 commit comments

Comments
 (0)