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

update DB2Rest version & use new maven wrapper config #801

Merged
merged 2 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
20 changes: 7 additions & 13 deletions .github/workflows/build-verify.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
name: Build & Verify

on:
workflow_dispatch:
inputs:
version:
description: 'Version to publish'
required: true
default: '1.3.0-SNAPSHOT'
ref:
description: 'Type the Branch, Tag or SHA to use for publishing Snapshot'
required: false
default: 'master'
pull_request:
paths-ignore:
-
Expand All @@ -19,9 +9,13 @@ on:
push:
branches:
- 'feature/**'

env:
VERSION: '1.3.1-SNAPSHOT'

jobs:
build:
name: Maven Build
name: Maven Build & Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -32,8 +26,8 @@ jobs:
distribution: 'liberica'
cache: 'maven'

- name: Build with Maven
run: ./mvnw -B verify --file pom.xml
- name: Build & Test
run: ./mvnw -Drevision=$VERSION --no-transfer-progress -B verify --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
#- name: Update dependency graph
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
DB2REST_VERSION:
description: 'DB2REST version that is already published in Maven Central'
required: true
default: '1.2.4'
default: '1.3.0'

# release:
# types: [created]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
version:
description: 'Version to publish, such as 1.3.0-SNAPSHOT'
required: true
default: '1.3.0-SNAPSHOT'
default: '1.3.1-SNAPSHOT'
ref:
description: 'The Branch, Tag or SHA to use to publish Snapshot'
required: false
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
pom.xml.tag
Expand All @@ -11,6 +11,7 @@ release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.flattened-pom.xml

### STS ###
.apt_generated
Expand Down
Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
21 changes: 19 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
# 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=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
Loading