Skip to content

Commit db57d13

Browse files
Update dependency org.webjars:bootstrap to v3.4.1 (#98)
* Update dependency org.webjars:bootstrap to v3.4.1 * fixes script * fixes issue with compiling * fixes issue with Integration Test --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Dilip Kolli <[email protected]>
1 parent 54b4392 commit db57d13

File tree

10 files changed

+438
-253
lines changed

10 files changed

+438
-253
lines changed

.github/workflows/springboot2-webapp-jsp-WAR.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,19 @@ jobs:
1717
build:
1818
name: Run Unit & Integration Tests
1919
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
working-directory: springboot2-webapp-jsp-WAR
2023
steps:
2124
- uses: actions/checkout@v3
2225
with:
2326
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2427

25-
- name: Set up JDK 18
28+
- name: Set up JDK 17
2629
uses: actions/[email protected]
2730
with:
28-
java-version: 18
31+
java-version: 17
2932
distribution: "zulu"
3033
cache: "maven"
31-
- name: Start up databases via docker compose
32-
run: |
33-
cd springboot2-webapp-jsp-WAR
34-
docker compose up -d
35-
sleep 15
36-
docker ps -a
3734
- name: Build and analyze
38-
run: |
39-
cd springboot2-webapp-jsp-WAR
40-
chmod +x mvnw
41-
./mvnw clean package
35+
run: ./mvnw clean verify

.github/workflows/springboot2-webapp-jsp.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,19 @@ jobs:
1717
build:
1818
name: Run Unit & Integration Tests
1919
runs-on: ubuntu-latest
20+
defaults:
21+
run:
22+
working-directory: springboot2-webapp-jsp
2023
steps:
2124
- uses: actions/checkout@v3
2225
with:
2326
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2427

25-
- name: Set up JDK 18
28+
- name: Set up JDK 17
2629
uses: actions/[email protected]
2730
with:
28-
java-version: 18
31+
java-version: 17
2932
distribution: "zulu"
3033
cache: "maven"
31-
- name: Start up databases via docker compose
32-
run: |
33-
cd springboot2-webapp-jsp
34-
docker compose up -d
35-
sleep 15
36-
docker ps -a
3734
- name: Build and analyze
38-
run: |
39-
cd springboot2-webapp-jsp
40-
chmod +x mvnw
41-
./mvnw clean package
35+
run: ./mvnw clean verify

login-registration-springboot-hibernate-jsp-auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.webjars</groupId>
7373
<artifactId>bootstrap</artifactId>
74-
<version>3.3.6</version>
74+
<version>3.4.1</version>
7575
</dependency>
7676

7777
<dependency>
14.6 KB
Binary file not shown.
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

0 commit comments

Comments
 (0)