Skip to content

Commit

Permalink
Bumps to the latest version available all the project dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabio Borriello committed Jan 3, 2024
2 parents d59bd13 + b10688b commit cc24650
Show file tree
Hide file tree
Showing 251 changed files with 2,769 additions and 303 deletions.
File renamed without changes.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ updates:
directory: "/"
schedule:
interval: "daily"
time: "11:30"
timezone: "UTC"
target-branch: develop
reviewers:
- fborriello
Expand All @@ -18,6 +20,8 @@ updates:
directory: "/"
schedule:
interval: daily
time: "11:30"
timezone: "UTC"
open-pull-requests-limit: 10
target-branch: develop
reviewers:
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/github-default-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
name: "Build"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "JDK set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '15'
distribution: 'adopt'
Expand All @@ -30,36 +30,36 @@ jobs:
name: "Test and quality check"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "Extract build information"
id: build_info
run: |
echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
- name: "JDK set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '15'
distribution: 'adopt'
- name: "Test and Quality check"
uses: nick-invision/retry@v2
with:
max_attempts: 3
timeout_minutes: 5
retry_on: error
command: |
mvn verify jacoco:report-aggregate coveralls:report -D repoToken=$COVERALLS_TOKEN sonar:sonar -D sonar.projectKey=BULL -D sonar.organization=$SONAR_ORGANIZATION -D sonar.host.url=https://sonarcloud.io -D sonar.login=$SONAR_TOKEN -D sonar.branch.name=$SOURCE_BRANCH -P compatibility-mode
env:
SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SOURCE_BRANCH: ${{ steps.build_info.outputs.SOURCE_BRANCH }}
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
COVERALLS_IO_TOKEN: ${{ secrets.COVERALLS_IO_TOKEN }}
with:
max_attempts: 3
timeout_minutes: 10
retry_on: error
command: |
mvn verify jacoco:report-aggregate coveralls:report -D repoToken=$COVERALLS_IO_TOKEN sonar:sonar -D sonar.projectKey=BULL -D sonar.organization=$SONAR_ORGANIZATION -D sonar.host.url=https://sonarcloud.io -D sonar.login=$SONAR_TOKEN -D sonar.branch.name=$SOURCE_BRANCH -P compatibility-mode
security-check:
name: "Security check"
runs-on: ubuntu-latest
Expand All @@ -69,24 +69,24 @@ jobs:
security-events: write
steps:
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "JDK set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '15'
distribution: 'adopt'
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: "Initialize CodeQL"
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: 'java'
- run: |
mvn clean install -B -DskipTests -P fast
- name: "Perform Analysis"
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
42 changes: 21 additions & 21 deletions .github/workflows/github-default-jdk11-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
name: "Build"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "JDK 11 set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
Expand All @@ -30,36 +30,36 @@ jobs:
name: "Test and quality check"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "Extract build information"
id: build_info
run: |
echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
- name: "JDK 11 set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
- name: "Test and Quality check"
uses: nick-invision/retry@v2
with:
max_attempts: 3
timeout_minutes: 5
retry_on: error
command: |
mvn verify jacoco:report-aggregate coveralls:report -D repoToken=$COVERALLS_TOKEN sonar:sonar -D sonar.projectKey=BULL -D sonar.organization=$SONAR_ORGANIZATION -D sonar.host.url=https://sonarcloud.io -D sonar.login=$SONAR_TOKEN -D sonar.branch.name=$SOURCE_BRANCH -P compatibility-mode
env:
SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SOURCE_BRANCH: ${{ steps.build_info.outputs.SOURCE_BRANCH }}
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
COVERALLS_IO_TOKEN: ${{ secrets.COVERALLS_IO_TOKEN }}
with:
max_attempts: 3
timeout_minutes: 10
retry_on: error
command: |
mvn verify jacoco:report-aggregate coveralls:report -D repoToken=$COVERALLS_IO_TOKEN sonar:sonar -D sonar.projectKey=BULL -D sonar.organization=$SONAR_ORGANIZATION -D sonar.host.url=https://sonarcloud.io -D sonar.login=$SONAR_TOKEN -D sonar.branch.name=$SOURCE_BRANCH -P compatibility-mode
security-check:
name: "Security check"
runs-on: ubuntu-latest
Expand All @@ -69,24 +69,24 @@ jobs:
security-events: write
steps:
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "JDK 11 set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: "Initialize CodeQL"
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: 'java'
- run: |
mvn clean install -B -DskipTests -P fast
- name: "Perform Analysis"
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
8 changes: 4 additions & 4 deletions .github/workflows/github-jdk11-release-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
name: "BULL Release"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "Extract build information"
Expand All @@ -29,7 +29,7 @@ jobs:
run: |
mvn versions:set -D newVersion=${TAG_NAME}
- name: "JDK set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/github-release-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
name: "BULL Release"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Cache Maven repository"
uses: actions/cache@v3.0.4
uses: actions/cache@v3.3.2
with:
path: ~/.m2
path: $HOME/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: "Extract build information"
Expand All @@ -29,7 +29,7 @@ jobs:
run: |
mvn versions:set -D newVersion=${TAG_NAME}
- name: "JDK set-up"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '15'
distribution: 'adopt'
Expand Down
11 changes: 7 additions & 4 deletions CHANGELOG-JDK11.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

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

### [2.1.4-jdk11] 2024.01.03
* Bumps to the latest version available all the project dependencies

### [2.1.3-jdk11] 2022.12.01
* Adds the Bill of Materials (BOM) module
* Replaces javax with jakarta
Expand Down Expand Up @@ -119,11 +122,11 @@ All notable changes to this project will be documented in this file.
* Module `bean-utils-library` has been relocated into `bull-bean-transformer`.
* The following classes has been deprecated, please find below the complete list and the new one to be used:

| Deprecated | **New one** |
| :----------- | :----------- |
| `com.expediagroup.beans.model.FieldMapping` | `FieldMapping` |
| Deprecated | **New one** |
|:------------------------------------------------|:-------------------|
| `com.expediagroup.beans.model.FieldMapping` | `FieldMapping` |
| `com.expediagroup.beans.model.FieldTransformer` | `FieldTransformer` |
| `com.expediagroup.beans.Transformer` | `Transformer` |
| `com.expediagroup.beans.Transformer` | `Transformer` |

### [1.5.0] 2019.08.06
#### Added
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

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

### [2.2.4] 2024.01.03
* Bumps to the latest version available all the project dependencies

### [2.2.3] 2022.12.01
* Replaces javax with jakarta
* Add the possibility to customize the special types avoiding any transformation on them

### [2.2.2] 2022.07.06
* Adds the Bill of Materials (BOM) module

### [2.2.2] 2022.07.06
* Adds the Bill of Materials (BOM) module

### [2.2.1] 2022.06.09
* Fixes an issue that was preventing skipping the injection for a given field. For more info about the feature see [here](README.md#skip-transformation-on-a-given-set-of-fields).

Expand Down
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -849,24 +849,24 @@ Following a comparison between the BULL functionalities and the following Third-
* [Jackson Data Bind](https://github.com/FasterXML/jackson-databind)
* [Dozer](http://dozer.sourceforge.net/)

| | **BULL** | **Apache Bean Utils** | **Jackson** | **Dozer** |
| :----------- | :-----------: | :-----------: | :-----------: | :-----------: |
| Mutable bean copy | X | X | X | X+ |
| Mutable bean with nested objects | X | - | X | X+ |
| Mutable bean extending classes | X | - | X | X+ |
| Immutable bean copy | X | - | - | X* |
| Mixed bean copy | X | - | - | X+ |
| Copy of beans without getter and setter methods defined | X | - | - | - |
| Mutable Bean with different field's name | X | - | - | X+ |
| Mixed with different field's type | X | - | - | X+ |
| Immutable with different field's type | X | - | - | X+ |
| Mutable Bean containing collection type fields containing complex objects | X | - | X | X |
| Mixed Bean containing collection type fields containing complex objects | X | - | - | X+ |
| Immutable Bean containing collection type fields containing complex objects | X | - | - | X+ |
| Mutable Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | X | X |
| Mixed Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | - | X+ |
| Immutable Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | - | X+ |
| Annotation field validation | X | - | X | - |
| | **BULL** | **Apache Bean Utils** | **Jackson** | **Dozer** |
|:------------------------------------------------------------------------------------------------------------------------|:--------:|:---------------------:|:-----------:|:---------:|
| Mutable bean copy | X | X | X | X+ |
| Mutable bean with nested objects | X | - | X | X+ |
| Mutable bean extending classes | X | - | X | X+ |
| Immutable bean copy | X | - | - | X* |
| Mixed bean copy | X | - | - | X+ |
| Copy of beans without getter and setter methods defined | X | - | - | - |
| Mutable Bean with different field's name | X | - | - | X+ |
| Mixed with different field's type | X | - | - | X+ |
| Immutable with different field's type | X | - | - | X+ |
| Mutable Bean containing collection type fields containing complex objects | X | - | X | X |
| Mixed Bean containing collection type fields containing complex objects | X | - | - | X+ |
| Immutable Bean containing collection type fields containing complex objects | X | - | - | X+ |
| Mutable Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | X | X |
| Mixed Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | - | X+ |
| Immutable Bean containing containing Map type fields with nested Maps inside. e.g. `Map<String, Map<String, Integer>>` | X | - | - | X+ |
| Annotation field validation | X | - | X | - |

_[*] Immutable types are not supported by Dozer. When a type doesn't have a no-arg constructor and all fields are final, Dozer can't perform the mapping.
A workaround is introducing the Builder Pattern. An example can be found [here](http://codeslut.blogspot.com/2010/05/mapping-immutable-value-objects-with.html)_
Expand All @@ -882,11 +882,11 @@ Let's have a look at the performance library performance. The test has been exec
* Immutable objects extending another immutable object
* Mixed objects

| | **Mutable** | **Immutable** | **Mixed** |
| :----------- | :-----------: | :-----------: | :-----------: |
| Simple objects (without nested objects) | ~0.011ms | ~0.018ms | NA |
| Complex objects (containing several nested object and several items in Map and Array objects) | ~0.37ms | ~0.21ms | ~0.22ms |
| CPU/Heap usage | [~0.2%/35 MB](docs/site/resources/images/stats/performance/mutableObject/jvmStats.jpg) | [~0.2%/30 MB](docs/site/resources/images/stats/performance/immutableObject/jvmStats.jpg) | [~0.2%/25 MB](docs/site/resources/images/stats/performance/mixedObject/jvmStats.jpg) |
| | **Mutable** | **Immutable** | **Mixed** |
|:----------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------:|
| Simple objects (without nested objects) | ~0.011ms | ~0.018ms | NA |
| Complex objects (containing several nested object and several items in Map and Array objects) | ~0.37ms | ~0.21ms | ~0.22ms |
| CPU/Heap usage | [~0.2%/35 MB](docs/site/resources/images/stats/performance/mutableObject/jvmStats.jpg) | [~0.2%/30 MB](docs/site/resources/images/stats/performance/immutableObject/jvmStats.jpg) | [~0.2%/25 MB](docs/site/resources/images/stats/performance/mixedObject/jvmStats.jpg) |

Transformation time [screenshot](docs/site/resources/images/stats/performance/transformationTime.png)

Expand Down Expand Up @@ -1071,4 +1071,4 @@ For any question, proposal, or help, please refer to the slack channel: [#bull](
This project is available under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
Copyright 2018-2021 Expedia Inc.
Copyright 2018-2023 Expedia Inc.
2 changes: 1 addition & 1 deletion bull-bean-transformer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.expediagroup.beans</groupId>
<artifactId>bean-utils-library-parent</artifactId>
<version>2.1.3-jdk11</version>
<version>2.1.4-jdk11-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
Loading

0 comments on commit cc24650

Please sign in to comment.