Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/springboot2-webapp-jsp-WAR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,19 @@ jobs:
build:
name: Run Unit & Integration Tests
runs-on: ubuntu-latest
defaults:
run:
working-directory: springboot2-webapp-jsp-WAR
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: 18
java-version: 17
distribution: "zulu"
cache: "maven"
- name: Start up databases via docker compose
run: |
cd springboot2-webapp-jsp-WAR
docker compose up -d
sleep 15
docker ps -a
- name: Build and analyze
run: |
cd springboot2-webapp-jsp-WAR
chmod +x mvnw
./mvnw clean package
run: ./mvnw clean verify
18 changes: 6 additions & 12 deletions .github/workflows/springboot2-webapp-jsp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,19 @@ jobs:
build:
name: Run Unit & Integration Tests
runs-on: ubuntu-latest
defaults:
run:
working-directory: springboot2-webapp-jsp
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 18
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: 18
java-version: 17
distribution: "zulu"
cache: "maven"
- name: Start up databases via docker compose
run: |
cd springboot2-webapp-jsp
docker compose up -d
sleep 15
docker ps -a
- name: Build and analyze
run: |
cd springboot2-webapp-jsp
chmod +x mvnw
./mvnw clean package
run: ./mvnw clean verify
2 changes: 1 addition & 1 deletion login-registration-springboot-hibernate-jsp-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.6</version>
<version>3.4.1</version>
</dependency>

<dependency>
Expand Down
Binary file modified springboot2-webapp-jsp-WAR/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
19 changes: 18 additions & 1 deletion springboot2-webapp-jsp-WAR/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
Loading