Skip to content

Commit

Permalink
Merge branch 'master' of github.com:WDAqua/Qanary
Browse files Browse the repository at this point in the history
  • Loading branch information
anbo-de committed Oct 2, 2023
2 parents 1e3d706 + c221ebb commit 82c51a5
Show file tree
Hide file tree
Showing 20 changed files with 346 additions and 272 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
STARDOG_PASSWORD: ${{ secrets.STARDOG_PASSWORD }}
steps:
- name: Docker Login
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker images and Push to Dockerhub
run: bash -c ./service_config/build_images.sh
- name: Init update
uses: MindMaster98/docker-service-updater@v0.1.5
uses: WSE-research/docker-service-updater@v0.2.1
with:
api_key: ${{ secrets.API_KEY }}
updater_host: ${{ secrets.UPDATER_HOST }}
9 changes: 5 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'adopt'
- name: Build with Maven
run: mvn -B package --file pom.xml
6 changes: 3 additions & 3 deletions qald-evaluator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.wdaqua.qanary</groupId>
<artifactId>qald.evaluator</artifactId>
<version>1.0.2</version>
<version>1.0.4</version>

<parent>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.8</version>
<version>2.4.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -91,7 +91,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20200518</version>
<version>20230227</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
Expand Down
101 changes: 46 additions & 55 deletions qanary-configuration-frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 82c51a5

Please sign in to comment.