Skip to content

Commit

Permalink
chore(deps): Update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Rene Leonhardt <[email protected]>
  • Loading branch information
reneleonhardt committed Jul 7, 2024
1 parent ac0eea4 commit 3576ead
Show file tree
Hide file tree
Showing 13 changed files with 353 additions and 320 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "maven"
directory: "/r2dbc-spec"
schedule:
interval: "daily"
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- os: ubuntu-latest
mvn: ./mvnw
- os: windows-latest
mvn: mvn
mvn: mvnw.cmd
- os: macos-latest
mvn: ./mvnw
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pullrequests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
- os: ubuntu-latest
mvn: ./mvnw
- os: windows-latest
mvn: mvn
mvn: mvnw.cmd
- os: macos-latest
mvn: ./mvnw
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
if: github.repository == 'r2dbc/r2dbc-spi'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
- name: Initialize Maven Version
run: ./mvnw -q org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version
run: ./mvnw -q org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate -Dexpression=project.version
- name: GPG Check
run: gpg -k
- name: Release with Maven
Expand Down
110 changes: 0 additions & 110 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file modified .mvn/wrapper/maven-wrapper.jar
100755 → 100644
Binary file not shown.
21 changes: 20 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=bin
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
9 changes: 4 additions & 5 deletions ci/build-and-deploy-to-maven-central.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version -o | grep -v INFO)
VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate -Dexpression=project.version -o | grep -v INFO)

if [[ $VERSION =~ [^.*-SNAPSHOT$] ]] ; then

Expand All @@ -16,8 +16,8 @@ if [[ $VERSION =~ [^(\d+\.)+(RC(\d+)|M(\d+)|RELEASE)$] ]] ; then
# Prepare GPG Key is expected to be in base64
# Exported with gpg -a --export-secret-keys "your@email" | base64 > gpg.base64
#
printf "$GPG_KEY_BASE64" | base64 --decode > gpg.asc
echo ${GPG_PASSPHRASE} | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
printf "%s" "$GPG_KEY_BASE64" | base64 --decode > gpg.asc
echo "${GPG_PASSPHRASE}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
gpg -k

#
Expand All @@ -29,11 +29,10 @@ if [[ $VERSION =~ [^(\d+\.)+(RC(\d+)|M(\d+)|RELEASE)$] ]] ; then
-s settings.xml \
-Pcentral \
-Dmaven.test.skip=true \
-Dgpg.passphrase=${GPG_PASSPHRASE} \
-Dgpg.passphrase="${GPG_PASSPHRASE}" \
clean deploy -B
else

echo "Not a release: $VERSION"
exit 1
fi

Loading

0 comments on commit 3576ead

Please sign in to comment.