christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into keycloak

Browse Source 
# Conflicts:
#	build.gradle
#	src/main/resources/application.properties
This commit is contained in:
Mahgs
2020-03-04 14:00:56 +01:00
parent ec69171458 cd18fa8cb4
commit 4d29d93fd5
5 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/gradle.yml vendored
View File

@ -9,16 +9,25 @@ on:
- master - master
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up JDK 13 - name: Set up JDK 13
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 13 java-version: 13
- uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Grant execute permission for gradlew - name: Grant execute permission for gradlew
run: chmod +x gradlew run: chmod +x gradlew
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew check run: ./gradlew check

8
build.gradle
View File

@ -11,6 +11,7 @@ spotbugs{
reportLevel = "high" reportLevel = "high"
toolVersion = '4.0.0-RC1' toolVersion = '4.0.0-RC1'
} }
tasks.withType(com.github.spotbugs.SpotBugsTask) { tasks.withType(com.github.spotbugs.SpotBugsTask) {
reports { reports {
html { html {
@ -43,6 +44,12 @@ configurations {
} }
repositories { repositories {
maven {
url = 'https://s3.cs.hhu.de/public/mops/'
metadataSources {
artifact()
}
}
mavenCentral() mavenCentral()
} }
@ -52,6 +59,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'mops:styleguide:2.0.0'
implementation 'org.keycloak:keycloak-spring-boot-starter:9.0.0' implementation 'org.keycloak:keycloak-spring-boot-starter:9.0.0'
implementation 'org.keycloak.bom:keycloak-adapter-bom:3.3.0.Final' implementation 'org.keycloak.bom:keycloak-adapter-bom:3.3.0.Final'
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'

14
src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java Normal file
View File

@ -0,0 +1,14 @@
package mops.gruppen2.controllers;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping("/gruppen2")
@Controller
public class Gruppen2Controller {
@GetMapping("/")
public String index() {
return "index";
}
}

3
src/main/resources/application.properties
View File

@ -9,6 +9,9 @@ spring.datasource.username=root
spring.datasource.password=geheim spring.datasource.password=geheim
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.security.user.name=root
spring.security.user.password=1234
spring.security.user.roles=ADMIN
keycloak.principal-attribute=preferred_username keycloak.principal-attribute=preferred_username
keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth

21
src/main/resources/templates/index.html Normal file
View File

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"
th:replace="~{mopslayout :: html(name='Name des Subsystems', headcontent=~{:: headcontent}, navigation=~{:: navigation}, bodycontent=~{:: bodycontent})}">
<head>
<meta charset="utf-8">
<title>Name des Subsystems</title>
<th:block th:fragment="headcontent">
<!-- Links, Skripts, Styles hier einfügen! -->
</th:block>
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<!-- Navigation als ungeordnete Liste mit einfachen Links hier einfügen! -->
</nav>
</header>
<main th:fragment="bodycontent">
<!-- Restlichen Inhalt hier einfügen! -->
</main>
</body>
</html>