Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
- github action
- gitignore
  • Loading branch information
MichiBaum committed Apr 29, 2024
1 parent 2ae8b7c commit 31d8b35
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 175 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
contrib-readme-job:
runs-on: ubuntu-latest
name: Automate contrib in readme
steps:
- name: Contribute List
uses: akhilmhdh/contributors-readme-action@v2.0.2
uses: akhilmhdh/contributors-readme-action@v2.3.8
with:
collaborators: all
commit_message: updated contributors in readme
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build and Publish

on: [push, pull_request]
on:
push:
branches:
- master

jobs:
build:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '21'
- name: Maven clean install
run: mvn clean install -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}} -DdockerHub.publish=false

- name: Maven clean compile
run: mvn clean compile -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}} -DdockerHub.publish=false

- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ There are microservices build with spring, spring cloud and so forth.
There are these microservices:
- [Admin Service](./admin-service/README.md)
- [Authentication Service](./authentication-service/README.md)
- [Gateway Service](./gateway-service/README.md)
- [Javadoc Service](./javadoc-service/README.md)
- [Registry Service](./registry-service/README.md)
- [Usermanagement Service](./usermanagement-service/README.md)
- [Website Service](./website-service/README.md)

## Release

Expand Down Expand Up @@ -54,6 +56,7 @@ In *C:\Windows\System32\drivers\etc* find file *hosts* and add those lines:
127.0.0.1 javadoc.michibaum.ch
127.0.0.1 usermanagement.michibaum.ch
127.0.0.1 authentication.michibaum.ch
127.0.0.1 michibaum.ch

#### Linux

Expand Down
31 changes: 1 addition & 30 deletions admin-service/.gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
!**/src/test/**/target/
Empty file.
4 changes: 4 additions & 0 deletions authentication-service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
31 changes: 1 addition & 30 deletions gateway-service/.gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
!**/src/test/**/target/
1 change: 1 addition & 0 deletions gateway-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Gateway Service
29 changes: 0 additions & 29 deletions javadoc-service/.gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,7 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/

# That you can not accidentally commit this folder
/src/main/resources/apidocs/
Empty file added permission-library/.gitignore
Empty file.
31 changes: 1 addition & 30 deletions registry-service/.gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
!**/src/test/**/target/
Empty file.
4 changes: 4 additions & 0 deletions usermanagement-service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
30 changes: 2 additions & 28 deletions website-service/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,6 @@ target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
src/main/resources/angular

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
# That you can not accidentally commit this folder
src/main/resources/angular
5 changes: 2 additions & 3 deletions website-service/pom.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>microservice</artifactId>
<groupId>com.michibaum</groupId>
<version>1.0.0-TEST-8</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>website-service</artifactId>
Expand All @@ -19,7 +19,6 @@
</properties>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand Down
17 changes: 0 additions & 17 deletions website/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,6 @@
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
.sass-cache/
Expand Down

0 comments on commit 31d8b35

Please sign in to comment.