IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mwolters/osknnsearch_enhancements

Browse Source
This commit is contained in:
Mark Wolters 2024-02-13 17:00:01 -04:00
commit 20931137d8
7 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,13 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "monthly"

2
.github/workflows/build.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
java-version: '21' java-version: '21'
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

10
.github/workflows/codeql-analysis.yml vendored
View File

@ -42,17 +42,17 @@ jobs:
steps: steps:
- uses: actions/setup-java@v3 - uses: actions/setup-java@v4
with: with:
distribution: 'oracle' distribution: 'oracle'
java-version: '21' java-version: '21'
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file. # If you wish to specify custom queries, you can do so here or in a config file.
@ -63,7 +63,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below) # If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@v2 uses: github/codeql-action/autobuild@v3
# ℹ️ Command-line programs to run using the OS shell. # ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl # 📚 https://git.io/JvXDl
@ -77,4 +77,4 @@ jobs:
# make release # make release
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3

16
.github/workflows/preview.yml vendored
View File

@ -22,10 +22,10 @@ jobs:
steps: steps:
- name: checkout repo - name: checkout repo
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: setup java - name: setup java
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: 'oracle' distribution: 'oracle'
java-version: '21' java-version: '21'
@ -47,7 +47,7 @@ jobs:
df -h df -h
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v3.2.3 uses: actions/cache@v4
with: with:
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@ -70,16 +70,16 @@ jobs:
mvn clean verify -Drevision="${{ env.PREVIEW_VERSION }}" mvn clean verify -Drevision="${{ env.PREVIEW_VERSION }}"
- name: Setup docker buildx - name: Setup docker buildx
uses: docker/setup-buildx-action@v2.2.1 uses: docker/setup-buildx-action@v3
- name: docker hub login - name: docker hub login
uses: docker/login-action@v2.1.0 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: docker test build - name: docker test build
uses: docker/build-push-action@v3.3.0 uses: docker/build-push-action@v5.1.0
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
@ -100,7 +100,7 @@ jobs:
cp nb5/target/nb5.jar nb5/target/nb5 staging cp nb5/target/nb5.jar nb5/target/nb5 staging
- name: upload artifacts - name: upload artifacts
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: binaries name: binaries
path: staging path: staging
@ -130,7 +130,7 @@ jobs:
scripts/bump-minor-version scripts/bump-minor-version
- name: docker push to hub - name: docker push to hub
uses: docker/build-push-action@v3.3.0 uses: docker/build-push-action@v5.1.0
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64

22
.github/workflows/release.yml vendored
View File

@ -19,10 +19,10 @@ jobs:
steps: steps:
- name: checkout repo - name: checkout repo
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: setup java - name: setup java
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: 'oracle' distribution: 'oracle'
java-version: '21' java-version: '21'
@ -44,7 +44,7 @@ jobs:
df -h df -h
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v3.2.3 uses: actions/cache@v4
with: with:
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@ -65,16 +65,16 @@ jobs:
mvn clean package -Drevision="${{ env.RELEASE_VERSION }}" -P enable-container-tests mvn clean package -Drevision="${{ env.RELEASE_VERSION }}" -P enable-container-tests
- name: Setup docker buildx - name: Setup docker buildx
uses: docker/setup-buildx-action@v2.2.1 uses: docker/setup-buildx-action@v3
- name: docker hub login - name: docker hub login
uses: docker/login-action@v2.1.0 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: docker test build - name: docker test build
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5.1.0
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
@ -95,7 +95,7 @@ jobs:
cp nb5/target/nb5.jar nb5/target/nb5 staging cp nb5/target/nb5.jar nb5/target/nb5 staging
- name: upload artifacts - name: upload artifacts
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: binaries name: binaries
path: staging path: staging
@ -105,7 +105,7 @@ jobs:
# continue-on-error: false # continue-on-error: false
# #
# - name: upload javadoc # - name: upload javadoc
# uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v4
# with: # with:
# name: javadoc # name: javadoc
# path: target/nosqlbench-*-javadoc.jar # path: target/nosqlbench-*-javadoc.jar
@ -115,7 +115,7 @@ jobs:
scripts/bump-minor-version scripts/bump-minor-version
- name: docker push to hub - name: docker push to hub
uses: docker/build-push-action@v3.3.0 uses: docker/build-push-action@v5.1.0
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
@ -178,7 +178,7 @@ jobs:
- name: Archive Test Results - name: Archive Test Results
if: always() if: always()
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: test-results name: test-results
path: | path: |
@ -193,7 +193,7 @@ jobs:
# - name: set git email # - name: set git email
# run: git config --global user.name "${{ secrets.NBDROID_NAME }}" # run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
# - name: download javadocs # - name: download javadocs
# uses: actions/download-artifact@v3 # uses: actions/download-artifact@v4
# with: # with:
# name: javadoc # name: javadoc
# - run: ls -la # - run: ls -la

2
adapter-http/pom.xml
View File

@ -67,7 +67,7 @@
<dependency> <dependency>
<groupId>io.swagger.parser.v3</groupId> <groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId> <artifactId>swagger-parser</artifactId>
<version>2.1.19</version> <version>2.1.20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger.core.v3</groupId> <groupId>io.swagger.core.v3</groupId>

14
mvn-defaults/pom.xml
View File

@ -122,12 +122,12 @@
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId> <artifactId>metrics-graphite</artifactId>
<version>4.2.23</version> <version>4.2.24</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId> <artifactId>metrics-core</artifactId>
<version>4.2.23</version> <version>4.2.24</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -188,7 +188,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId> <artifactId>netty-handler</artifactId>
<version>4.1.105.Final</version> <version>4.1.106.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
@ -361,23 +361,23 @@
<dependency> <dependency>
<groupId>org.graalvm.sdk</groupId> <groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId> <artifactId>graal-sdk</artifactId>
<version>23.0.2</version> <version>23.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.graalvm.js</groupId> <groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId> <artifactId>js</artifactId>
<version>23.0.2</version> <version>23.0.3</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.graalvm.js</groupId> <groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId> <artifactId>js-scriptengine</artifactId>
<version>23.0.1</version> <version>23.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.graalvm.tools</groupId> <groupId>org.graalvm.tools</groupId>
<artifactId>profiler</artifactId> <artifactId>profiler</artifactId>
<version>23.0.1</version> <version>23.0.3</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>