Skip to content

Commit b189d83

Browse files
pm-oscpm-osc
authored
Merge branch 'master' into list-property-order
2 parents 584d1f2 + 1b92960 commit b189d83

62 files changed

Lines changed: 1294 additions & 134 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-backend-cql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
with:
248248
name: jacoco-reports-${{ matrix.module }}-${{ matrix.name }}
249249
path: target/jacoco-combined.exec
250-
- uses: codecov/codecov-action@v4
250+
- uses: codecov/codecov-action@v5
251251
env:
252252
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
253253
with:

‎.github/workflows/ci-backend-hbase.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
with:
113113
name: jacoco-reports-${{ matrix.module }}-${{ matrix.name }}
114114
path: target/jacoco-combined.exec
115-
- uses: codecov/codecov-action@v4
115+
- uses: codecov/codecov-action@v5
116116
env:
117117
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
118118
with:

‎.github/workflows/ci-backend-scylla.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
with:
144144
name: jacoco-reports-${{ matrix.module }}-${{ matrix.name }}
145145
path: target/jacoco-combined.exec
146-
- uses: codecov/codecov-action@v4
146+
- uses: codecov/codecov-action@v5
147147
env:
148148
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
149149
with:

‎.github/workflows/ci-core.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
with:
140140
name: jacoco-reports-${{ matrix.module }}-java-${{ matrix.java }}
141141
path: target/jacoco-combined.exec
142-
- uses: codecov/codecov-action@v4
142+
- uses: codecov/codecov-action@v5
143143
env:
144144
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
145145
with:

‎.github/workflows/ci-index-es-dummy.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
strategy:
3232
matrix:
3333
include:
34+
- module: es
35+
args: "-Pelasticsearch9"
36+
name: es9-java8
37+
java: 8
3438
- module: es
3539
args: "-Pelasticsearch8"
3640
name: es8
@@ -47,6 +51,11 @@ jobs:
4751
args: "-Pelasticsearch60"
4852
name: es60
4953
java: 8
54+
- module: es
55+
install-args: "-Pjava-11"
56+
args: "-Pelasticsearch9"
57+
name: es9
58+
java: 11
5059
- module: es
5160
install-args: "-Pjava-11"
5261
args: "-Pelasticsearch8"

‎.github/workflows/ci-index-es.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
include:
69+
- module: es
70+
args: "-Pelasticsearch9"
71+
name: es9-java8
72+
java: 8
6973
- module: es
7074
args: "-Pelasticsearch8"
7175
name: es8-java8
@@ -82,6 +86,11 @@ jobs:
8286
args: "-Pelasticsearch60"
8387
name: es60-java8
8488
java: 8
89+
- module: es
90+
install-args: "-Pjava-11"
91+
args: "-Pelasticsearch9"
92+
name: es9
93+
java: 11
8594
- module: es
8695
install-args: "-Pjava-11"
8796
args: "-Pelasticsearch8"
@@ -122,7 +131,7 @@ jobs:
122131
with:
123132
name: jacoco-reports-${{ matrix.module }}-${{ matrix.name }}
124133
path: target/jacoco-combined.exec
125-
- uses: codecov/codecov-action@v4
134+
- uses: codecov/codecov-action@v5
126135
env:
127136
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
128137
with:

‎.github/workflows/ci-index-solr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
with:
9696
name: jacoco-reports-${{ matrix.module }}-${{ matrix.name }}
9797
path: target/jacoco-combined.exec
98-
- uses: codecov/codecov-action@v4
98+
- uses: codecov/codecov-action@v5
9999
env:
100100
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
101101
with:

‎.github/workflows/ci-publish-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
mkdir -p ~/.m2/
7575
echo "<settingsSecurity><master>$MASTER_PASSWORD</master></settingsSecurity>" > ~/.m2/settings-security.xml
76-
echo "<settings><servers><server><id>ossrh</id><username>$OSSRH_USERNAME</username><password>$OSSRH_PASSWORD</password></server></servers></settings>" > ~/.m2/settings.xml
76+
echo "<settings><servers><server><id>central</id><username>$OSSRH_USERNAME</username><password>$OSSRH_PASSWORD</password></server></servers></settings>" > ~/.m2/settings.xml
7777
env:
7878
MASTER_PASSWORD: ${{ secrets.MASTER_PASSWORD }}
7979
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
@@ -83,4 +83,4 @@ jobs:
8383
- name: Make JanusGraph JAR artifacts
8484
run: mvn clean install -Pjanusgraph-release -DskipTests=true
8585
- name: Deploy JanusGraph JAR artifacts into staging repository
86-
run: mvn deploy -Pjanusgraph-release,janusgraph-commit-release -DskipTests=true -DautoReleaseAfterClose=true -Ddescription="$JG_DESCRIPTION" -DstagingDescription="$JG_DESCRIPTION"
86+
run: mvn deploy -Pjanusgraph-release -DskipTests=true -DwaitUntil=published -DautoPublish=true -Ddescription="$JG_DESCRIPTION" -DstagingDescription="$JG_DESCRIPTION"

‎.github/workflows/ci-publish-official.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: |
7575
mkdir -p ~/.m2/
7676
echo "<settingsSecurity><master>$MASTER_PASSWORD</master></settingsSecurity>" > ~/.m2/settings-security.xml
77-
echo "<settings><servers><server><id>ossrh</id><username>$OSSRH_USERNAME</username><password>$OSSRH_PASSWORD</password></server></servers></settings>" > ~/.m2/settings.xml
77+
echo "<settings><servers><server><id>central</id><username>$OSSRH_USERNAME</username><password>$OSSRH_PASSWORD</password></server></servers></settings>" > ~/.m2/settings.xml
7878
env:
7979
MASTER_PASSWORD: ${{ secrets.MASTER_PASSWORD }}
8080
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
@@ -87,7 +87,7 @@ jobs:
8787
- name: Print content of the generated target directory for debugging purposes
8888
run: echo $(ls janusgraph-dist/target/)
8989
- name: Deploy JanusGraph JAR artifacts into staging repository
90-
run: mvn deploy -Pjanusgraph-release -DskipTests=true
90+
run: mvn deploy -Pjanusgraph-release -DskipTests=true -DwaitUntil=validated -DautoPublish=false
9191
- name: Sign JanusGraph full distribution artifact
9292
run: gpg --armor --detach-sign --yes janusgraph-dist/target/${JG_FULL_DIST_NAME}.zip
9393
- name: Install requirements to build documentation

‎.github/workflows/ci-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
# Thus, we add `continue-on-error: true` here, but we should remove it
115115
# when either the issue is fixed (see: https://github.com/aquasecurity/trivy-action/issues/389)
116116
# or we self-host trivy database.
117-
uses: aquasecurity/trivy-action@0.28.0
117+
uses: aquasecurity/trivy-action@0.32.0
118118
continue-on-error: true
119119
with:
120120
image-ref: 'ghcr.io/janusgraph/janusgraph:${{ env.JG_VER }}${{ matrix.tag_suffix }}'

0 commit comments

Comments
 (0)