Skip to content

Commit

Permalink
Upgrading repo to the latest Spring
Browse files Browse the repository at this point in the history
  • Loading branch information
SuppieRK committed Apr 24, 2024
1 parent baa92f7 commit cdb7ef8
Show file tree
Hide file tree
Showing 30 changed files with 610 additions and 556 deletions.
52 changes: 31 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,52 @@
name: Main Build Script
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Java CI with Gradle for master branch

on:
workflow_dispatch: {}
push:
branches:
- master
branches: [ master ]
paths-ignore:
- '**/*.md'
pull_request:
types: [ opened, synchronize, reopened ]
- '**.yml'
- '**.md'
- '**/gradle-wrapper.jar'
- '**/gradle-wrapper.properties'
- '**/gradlew'
- '**/gradlew.bat'

jobs:
build:
runs-on: ubuntu-latest

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

- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'adopt'
distribution: 'temurin'
java-version: 17

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v3

- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle

- name: Build and analyze
run: ./gradlew build jacocoTestReport
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Check code coverage with Codecov
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Build with Gradle
run: ./gradlew build

- name: Publish to Maven Central
run: ./gradlew publishAllPublicationsToMavenCentral --no-configuration-cache
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
71 changes: 0 additions & 71 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Java CI with Gradle for Pull Requests

on:
workflow_dispatch: {}
pull_request:
branches-ignore:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v3

- name: Cache Gradle packages
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build
47 changes: 0 additions & 47 deletions .github/workflows/release.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/workflows/sonarqube.yml

This file was deleted.

9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

All notable changes to this project will be documented in this file.

The format based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.2.5.0]

### Changed
- Updated an overall project to the most recent Spring version
- Changed versioning scheme to reflect the Spring version being used

## [1.0.1]

### Fixed
Expand All @@ -15,5 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial implementation

[1.0.1]: https://github.com/SuppieRK/spring-boot-multilevel-cache-starter/compare/v1.0.1...v3.2.5.0
[1.0.1]: https://github.com/SuppieRK/spring-boot-multilevel-cache-starter/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/SuppieRK/spring-boot-multilevel-cache-starter/compare/6a187283...v1.0.0
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Please note we have a code of conduct, please follow it in all your interactions

## Pull Request Process

1. Ensure any install or build dependencies are removed before the end of the layer when doing a
1. Ensure any installation or build dependencies are removed before the end of the layer when doing a
build.
2. Update the README.md with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
3. Increase the version numbers in any examples files and the README.md to the new version that this
3. Increase the version numbers in any example files and the README.md to the new version that this
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
do not have permission to do that, you may request the second reviewer to merge it for you.
Expand All @@ -33,7 +33,7 @@ For further reference, please consider the following sections:

This library defines all artifact versions without Maven Bill of Materials because of:

* Ease of use with [Intellij IDEA Package Search](https://blog.jetbrains.com/idea/2021/06/intellij-idea-2021-2-eap-2/?_gl=1*17t2ibb*_ga*MjE4Mjk3MC4xNjI3NTg1MTk1*_ga_5779HKX92V*MTYyNzU4NTE5OC4xLjAuMTYyNzU4NTE5OC4w#package_search_integration%60}#package_search_integration) functionality
* Ease of use with [IntelliJ IDEA Package Search](https://blog.jetbrains.com/idea/2021/06/intellij-idea-2021-2-eap-2/?_gl=1*17t2ibb*_ga*MjE4Mjk3MC4xNjI3NTg1MTk1*_ga_5779HKX92V*MTYyNzU4NTE5OC4xLjAuMTYyNzU4NTE5OC4w#package_search_integration%60}#package_search_integration) functionality
* Ease of use with [Dependabot](https://dependabot.com/)

### Build tools
Expand Down Expand Up @@ -61,7 +61,7 @@ This library defines all artifact versions without Maven Bill of Materials becau
### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
contributors and maintainers pledge to make participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
Expand All @@ -86,7 +86,7 @@ Examples of unacceptable behavior by participants include:
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
* Another conduct that could reasonably be considered inappropriate in a
professional setting

### Our Responsibilities
Expand Down Expand Up @@ -114,8 +114,8 @@ further defined and clarified by project maintainers.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
complaints will be reviewed and investigated and will result in a response
deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 Roman Khlebnov
Copyright (c) 2024 Roman Khlebnov

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit cdb7ef8

Please sign in to comment.