Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge recent changes in to main #80

Merged
merged 26 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ee1f8de
Update README.md with Zenodo DOI
anneferger Dec 21, 2023
16476ed
Bump org.owasp:dependency-check-maven from 9.0.1 to 9.0.7
dependabot[bot] Dec 25, 2023
fa79fda
Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Dec 25, 2023
a97b8d3
Bump io.swagger.core.v3:swagger-jaxrs2 from 2.2.19 to 2.2.20
dependabot[bot] Dec 25, 2023
42579e8
Bump io.swagger.core.v3:swagger-jaxrs2-servlet-initializer-v2
dependabot[bot] Dec 25, 2023
f97e433
Merge pull request #70 from TEIC/dependabot/maven/io.swagger.core.v3-…
dependabot[bot] Jan 3, 2024
1497d52
Merge pull request #67 from TEIC/dependabot/maven/org.owasp-dependenc…
dependabot[bot] Jan 3, 2024
2861fcd
Merge pull request #68 from TEIC/dependabot/maven/org.apache.maven.pl…
dependabot[bot] Jan 3, 2024
ee0b158
Merge pull request #69 from TEIC/dependabot/maven/io.swagger.core.v3-…
dependabot[bot] Jan 3, 2024
8f142b6
Update README.md
anneferger Jan 4, 2024
25c5665
Bump org.owasp:dependency-check-maven from 9.0.7 to 9.0.8
dependabot[bot] Jan 8, 2024
2aedc80
Merge pull request #71 from TEIC/dependabot/maven/org.owasp-dependenc…
peterstadler Jan 8, 2024
ede1418
Bump org.owasp:dependency-check-maven from 9.0.8 to 9.0.9
dependabot[bot] Jan 22, 2024
d355f84
Merge pull request #72 from TEIC/dependabot/maven/org.owasp-dependenc…
anneferger Jan 23, 2024
2944ad7
Bump org.owasp:dependency-check-maven from 9.0.9 to 9.0.10
dependabot[bot] Mar 18, 2024
01a43eb
Merge pull request #74 from TEIC/dependabot/maven/org.owasp-dependenc…
peterstadler Mar 18, 2024
04a0691
Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Mar 25, 2024
c31513f
Bump io.swagger.core.v3:swagger-jaxrs2 from 2.2.20 to 2.2.21
dependabot[bot] Mar 25, 2024
142ea24
Bump io.swagger.core.v3:swagger-jaxrs2-servlet-initializer-v2
dependabot[bot] Mar 25, 2024
ca8b114
Bump org.owasp:dependency-check-maven from 9.0.10 to 9.1.0
dependabot[bot] Apr 1, 2024
06f3237
Merge remote-tracking branch 'new/dependabot/maven/org.apache.maven.p…
anneferger Apr 2, 2024
86e2a8e
Merge remote-tracking branch 'new/dependabot/maven/io.swagger.core.v3…
anneferger Apr 2, 2024
5acc033
Merge remote-tracking branch 'new/dependabot/maven/io.swagger.core.v3…
anneferger Apr 2, 2024
d894cfd
Update maven_docker.yml
anneferger Apr 10, 2024
d1bb047
Bump org.apache.maven.plugins:maven-pmd-plugin from 3.21.2 to 3.22.0
dependabot[bot] Apr 29, 2024
31cb338
Merge pull request #79 from TEIC/dependabot/maven/org.apache.maven.pl…
anneferger Apr 29, 2024
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
22 changes: 11 additions & 11 deletions .github/workflows/maven_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
- name: maven-settings
uses: s4u/maven-settings-action@v2.7.0
uses: s4u/maven-settings-action@v3.0.0
with:
servers: '[{"id": "edirom", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"},{"id": "teic", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"}]'
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn clean package --file pom.xml
- name: Upload Maven build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifact
path: /home/runner/work/TEIGarage/TEIGarage/target/teigarage.war
Expand All @@ -41,10 +41,10 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifact
path: artifact/
Expand All @@ -56,15 +56,15 @@ jobs:
# use the current user to log into the
# GitHub container registry
- name: Log in to GitHub Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Login against DockerHub registry
- name: Log in to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.PETERS_DOCKERHUB_USERNAME }}
password: ${{ secrets.PETERS_DOCKERHUB_TOKEN }}
Expand All @@ -73,7 +73,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/teic/teigarage
Expand All @@ -84,7 +84,7 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand All @@ -94,7 +94,7 @@ jobs:
BUILDTYPE=github
# Use current README for DockerHub description
- name: Update repo description
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.PETERS_DOCKERHUB_USERNAME }}
password: ${{ secrets.PETERS_DOCKERHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
[![fair-software.eu](https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F-green)](https://fair-software.eu)
[![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/6925/badge)](https://bestpractices.coreinfrastructure.org/projects/6925)
[![NFDI4C Registry](https://img.shields.io/badge/NFDI4Culture%20Registry-64BEA0)](https://nfdi4culture.de/id/E4102)
[![DOI](https://zenodo.org/badge/375025034.svg)](https://zenodo.org/doi/10.5281/zenodo.8036581)

<!-- TABLE OF CONTENTS -->
## Table of Contents
Expand Down Expand Up @@ -144,7 +145,7 @@ The TEIGarage Java project can be built with Maven using
`mvn -B package --file pom.xml`

Readymade .war files can be downloaded from the [GitHub Action using nightly.link](https://nightly.link/TEIC/TEIGarage/workflows/maven_docker/main/artifact.zip). For the required Java version see:
https://github.com/TEIC/TEIGarage/blob/48726dd73a49b1c284d174dc68c26e6fe9cdb03d/.github/workflows/maven_docker.yml#L21.
https://github.com/TEIC/TEIGarage/blob/48726dd73a49b1c284d174dc68c26e6fe9cdb03d/.github/workflows/maven_docker.yml#L21

## dependencies

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0 </version>
<version>3.13.0 </version>
<configuration>
<source>11</source>
<target>11</target>
Expand All @@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<version>3.22.0</version>
<configuration>
<failOnViolation>false</failOnViolation>
<printFailingErrors>true</printFailingErrors>
Expand All @@ -172,7 +172,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>9.0.1</version>
<version>9.1.0</version>
<executions>
<execution>
<goals>
Expand All @@ -194,12 +194,12 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.2.19</version>
<version>2.2.21</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
<version>2.2.19</version>
<version>2.2.21</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Expand Down
Loading