Skip to content

Commit

Permalink
Merge branch 'master' into b-jena-next
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
  • Loading branch information
berezovskyi committed Oct 9, 2024
2 parents c2e9400 + f331b62 commit b7d396b
Show file tree
Hide file tree
Showing 190 changed files with 11,196 additions and 2,310 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ indent_size = 4
[*.{xml,html,js,yml,css}]
indent_style = space
indent_size = 2

[Jenkinsfile]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
open-pull-requests-limit: 30
open-pull-requests-limit: 50
schedule:
interval: "daily"
- package-ecosystem: "github-actions" # See documentation for possible values
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,27 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-codeql-${{ hashFiles('.github/workflows/codeql-analysis.yml') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
# 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)
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -73,4 +73,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
with:
show-progress: false
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
45 changes: 39 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,58 @@
# Eclipse Lyo changelog

## [6.0.0-SNAPSHOT]
## [7.0.0-SNAPSHOT]

### Added

- Introducing capability to set the servletUri to be used by the OAuthConfiguration
### Changed

### Deprecated

### Removed

### Fixed

## [6.0.0]

### Security

This release does not contain security updates.

### Added

- Introducing capability to set the `servletUri` to be used by the `OAuthConfiguration`
- OSLC PROMCODE domain model and generated POJOs
- Support for additional request headers to `OslcQuery`

### Changed

- Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target).
- Allow application to reset the oauth token cached within the server, when it deems that it is no longer valid
- 🧨Corrected cardinality and range of the oslc_config:acceptedBy property (from String[0..1] to Resource[0..*])
- 🧨 Migrated from Java EE (`javax.` namespace) to Jakarta packages
- Upgrade to Jersey 3.1.5
- **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has
been tested using JDK 17, 21, 23, and 24-ea.
- Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with
`kotlin-stdlib` due to
[Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target).
- Allow application to reset the OAuth token cached within the server, when it
deems that it is no longer valid
- 🧨 Corrected cardinality and range of the `oslc_config:acceptedBy` property (from
String[0..1] to Resource[0..*])
- Changed scope of dependencies in `oauth-webapp` to avoid inclusion multiple times
during runtime.

### Deprecated

This release does not introduce deprecations.

### Removed

- 🧨 Support for JDK 11 (and all versions below 17) is removed. **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has been tested using JDK 17, 20, and 21-ea.
- 🧨 Support for JDK 11 (and all versions below 17) is removed.
- 🧨 Support for Java EE and Jakarta EE 8 is removed.

### Fixed

This release does not contain bug fixes.

## [5.1.1]

### Added
Expand Down
Loading

0 comments on commit b7d396b

Please sign in to comment.