From 3f721eb20d6eadca84d638b82f6e3dea137d5a50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 10:06:25 +0000 Subject: [PATCH 01/50] build(deps): bump github/codeql-action from 1.0.31 to 1.0.32 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.0.31 to 1.0.32. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.0.31...v1.0.32) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 2445d791..fd5d9c55 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.0.31 + uses: github/codeql-action/init@v1.0.32 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.0.31 + uses: github/codeql-action/autobuild@v1.0.32 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.0.31 + uses: github/codeql-action/analyze@v1.0.32 From aafe51d7c018220aa19a3bd64f17117abca4dd4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 16:56:25 +0000 Subject: [PATCH 02/50] build(deps): bump caffeine from 2.9.3 to 3.0.5 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 2.9.3 to 3.0.5. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v2.9.3...v3.0.5) --- updated-dependencies: - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54d6791e..3ac838ee 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ com.github.ben-manes.caffeine caffeine - 2.9.3 + 3.0.5 provided true From 211b417e246fab273fac186c3a5222cea2cf4d4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 11:14:57 +0000 Subject: [PATCH 03/50] build(deps): bump maven-javadoc-plugin from 3.3.1 to 3.3.2 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ac838ee..f4454e00 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 ${java.version.minimal} From 33806c53d1726e2d3e503d693916a50a23c55635 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 10:06:20 +0000 Subject: [PATCH 04/50] build(deps): bump nexus-staging-maven-plugin from 1.6.8 to 1.6.10 Bumps nexus-staging-maven-plugin from 1.6.8 to 1.6.10. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4454e00..6ff584e0 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.10 true sonatype-ossrh From 14e08663a50a19ec3345afccce381a77506b2d8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 10:06:26 +0000 Subject: [PATCH 05/50] build(deps): bump maven-compiler-plugin from 3.9.0 to 3.10.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.9.0...maven-compiler-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4454e00..a03df3b2 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.9.0 + 3.10.0 true ${java.version.minimal} From 471a36c444ae9729dd0a07adcecc001063407e88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 10:09:15 +0000 Subject: [PATCH 06/50] build(deps): bump github/codeql-action from 1.0.32 to 1.1.0 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.0.32 to 1.1.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.0.32...v1.1.0) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index fd5d9c55..30ea37db 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.0.32 + uses: github/codeql-action/init@v1.1.0 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.0.32 + uses: github/codeql-action/autobuild@v1.1.0 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.0.32 + uses: github/codeql-action/analyze@v1.1.0 From ed61ec97d203c889fa198f1c477f8b7507c235ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:04:52 +0000 Subject: [PATCH 07/50] build(deps): bump nexus-staging-maven-plugin from 1.6.10 to 1.6.11 Bumps nexus-staging-maven-plugin from 1.6.10 to 1.6.11. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bb4fd6f..d3f3a7ee 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.10 + 1.6.11 true sonatype-ossrh From 2eb8acb918076168d57315f669c595dfec1c2adf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 10:07:33 +0000 Subject: [PATCH 08/50] build(deps): bump github/codeql-action from 1.1.0 to 1.1.2 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.1.0...v1.1.2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 30ea37db..d662fa40 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.1.0 + uses: github/codeql-action/init@v1.1.2 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.1.0 + uses: github/codeql-action/autobuild@v1.1.2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.1.0 + uses: github/codeql-action/analyze@v1.1.2 From 5ddf40de1069af6724fe968092b652c13bb031eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 10:04:19 +0000 Subject: [PATCH 09/50] build(deps): bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 Bumps nexus-staging-maven-plugin from 1.6.11 to 1.6.12. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3f3a7ee..363270bd 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.11 + 1.6.12 true sonatype-ossrh From 7ac8ba72612ff3fb1e5619f3733cba73a170c2cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 10:09:33 +0000 Subject: [PATCH 10/50] build(deps): bump github/codeql-action from 1.1.2 to 1.1.3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.2 to 1.1.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.1.2...v1.1.3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index d662fa40..716f3e10 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.1.2 + uses: github/codeql-action/init@v1.1.3 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.1.2 + uses: github/codeql-action/autobuild@v1.1.3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.1.2 + uses: github/codeql-action/analyze@v1.1.3 From 60e311121b207121ca1a0379eb1cd15a9a5c157b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:05:12 +0000 Subject: [PATCH 11/50] build(deps): bump drill-fmpp-maven-plugin from 1.19.0 to 1.20.0-hadoop2 Bumps drill-fmpp-maven-plugin from 1.19.0 to 1.20.0-hadoop2. --- updated-dependencies: - dependency-name: org.apache.drill.tools:drill-fmpp-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 363270bd..52e19f9f 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ org.apache.drill.tools drill-fmpp-maven-plugin - 1.19.0 + 1.20.0-hadoop2 generate-fmpp From d626865897910ecfa0f84e752be0886df8e4dc51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:08:09 +0000 Subject: [PATCH 12/50] build(deps): bump actions/setup-java from 2.5.0 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.5.0 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2.5.0...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 716f3e10..56d1c546 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2.4.0 - name: Set up Java 17 - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index c54f98e6..bd98e0c4 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2.4.0 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index f9164842..3fc6a810 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2.4.0 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2794848b..7442bb80 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2.4.0 - name: Set up Java 17 - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v2.4.0 - name: Set up Java 17 - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' From d6fd23b07e6f6abce81b7ae40260874f2cc4c1e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 10:07:32 +0000 Subject: [PATCH 13/50] build(deps): bump actions/checkout from 2.4.0 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 56d1c546..bf2eeeb5 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -19,7 +19,7 @@ jobs: security-events: write steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 - name: Set up Java 17 uses: actions/setup-java@v3 diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index bd98e0c4..b4c00f62 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 - name: Set up Java 17 & Deployment credentials uses: actions/setup-java@v3 diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 3fc6a810..407ceb0a 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 - name: Set up Java 17 & Deployment credentials uses: actions/setup-java@v3 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7442bb80..e5f23cf8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 - name: Set up Java 17 uses: actions/setup-java@v3 @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 - name: Set up Java 17 uses: actions/setup-java@v3 From 173b884ef788f1cd681a3bf0ded25cd1a99eb68c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Mar 2022 10:08:59 +0000 Subject: [PATCH 14/50] build(deps): bump github/codeql-action from 1.1.3 to 1.1.4 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.1.3...v1.1.4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index bf2eeeb5..25780ba2 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.1.3 + uses: github/codeql-action/init@v1.1.4 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.1.3 + uses: github/codeql-action/autobuild@v1.1.4 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.1.3 + uses: github/codeql-action/analyze@v1.1.4 From 385988c338f30c3e7c18d3d2f83133089d586228 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Mar 2022 10:06:16 +0000 Subject: [PATCH 15/50] build(deps-dev): bump version.mockito from 4.3.1 to 4.4.0 Bumps `version.mockito` from 4.3.1 to 4.4.0. Updates `mockito-core` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0) Updates `mockito-junit-jupiter` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52e19f9f..2c91840e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 8 - 4.3.1 + 4.4.0 PADLA for Java From fdcc43ea44beeeba18c1efceb51a0881651c98c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Mar 2022 10:04:49 +0000 Subject: [PATCH 16/50] build(deps): bump maven-compiler-plugin from 3.10.0 to 3.10.1 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.0...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c91840e..bb91ab94 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.0 + 3.10.1 true ${java.version.minimal} From 40d8b43e9db2470da2c844ac17f6d4cff938ed37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Mar 2022 10:07:47 +0000 Subject: [PATCH 17/50] build(deps): bump github/codeql-action from 1.1.4 to 1.1.5 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.1.4...v1.1.5) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 25780ba2..96bc0a93 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.1.4 + uses: github/codeql-action/init@v1.1.5 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.1.4 + uses: github/codeql-action/autobuild@v1.1.5 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.1.4 + uses: github/codeql-action/analyze@v1.1.5 From 305db3bcff4f51d6094e8890404f9d88963263d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 10:12:29 +0000 Subject: [PATCH 18/50] build(deps): bump caffeine from 3.0.5 to 3.0.6 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.0.5...v3.0.6) --- updated-dependencies: - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb91ab94..ecdbf0f9 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ com.github.ben-manes.caffeine caffeine - 3.0.5 + 3.0.6 provided true From 1b7468cadb0026cb23fabe8350ad544de0173115 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:08:17 +0000 Subject: [PATCH 19/50] build(deps): bump github/codeql-action from 1.1.5 to 2.1.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1.1.5 to 2.1.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1.1.5...v2.1.6) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 96bc0a93..1aaac597 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v1.1.5 + uses: github/codeql-action/init@v2.1.6 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v1.1.5 + uses: github/codeql-action/autobuild@v2.1.6 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1.1.5 + uses: github/codeql-action/analyze@v2.1.6 From c8d8e3cee41ccdfa6944bdd00896e392351f3879 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:05:34 +0000 Subject: [PATCH 20/50] build(deps): bump maven-surefire-plugin from 3.0.0-M5 to 3.0.0-M6 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M5 to 3.0.0-M6. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ecdbf0f9..4e1a068d 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M6 all true From 45bb5735e67580d2359743fc5fe5c77c4082d5c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:05:07 +0000 Subject: [PATCH 21/50] build(deps): bump asm from 9.2 to 9.3 Bumps asm from 9.2 to 9.3. --- updated-dependencies: - dependency-name: org.ow2.asm:asm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e1a068d..b053ed83 100644 --- a/pom.xml +++ b/pom.xml @@ -271,7 +271,7 @@ org.ow2.asm asm - 9.2 + 9.3 provided true From 034f8a41161456d056c8f31d92b8cadf20a35d3a Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Wed, 6 Apr 2022 00:34:09 +0300 Subject: [PATCH 22/50] build(dep): use ASM BOM This resolves #348 --- java-commons/pom.xml | 2 ++ pom.xml | 14 +++++++------- ultimate-messenger/pom.xml | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/java-commons/pom.xml b/java-commons/pom.xml index d244edbe..ed5b8f96 100644 --- a/java-commons/pom.xml +++ b/java-commons/pom.xml @@ -31,6 +31,8 @@ org.ow2.asm asm + provided + true org.javassist diff --git a/pom.xml b/pom.xml index b053ed83..8dac4892 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,13 @@ + + org.ow2.asm + asm-bom + 9.3 + pom + import + org.junit junit-bom @@ -268,13 +275,6 @@ true - - org.ow2.asm - asm - 9.3 - provided - true - org.javassist javassist diff --git a/ultimate-messenger/pom.xml b/ultimate-messenger/pom.xml index 9023600c..9ce5b93f 100644 --- a/ultimate-messenger/pom.xml +++ b/ultimate-messenger/pom.xml @@ -23,6 +23,8 @@ org.ow2.asm asm + provided + true org.javassist From 3d62008221d1c017edaec94c2290b03f7e4b387a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 10:07:45 +0000 Subject: [PATCH 23/50] build(deps): bump github/codeql-action from 2.1.6 to 2.1.7 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 1aaac597..bed19b51 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.6 + uses: github/codeql-action/init@v2.1.7 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.6 + uses: github/codeql-action/autobuild@v2.1.7 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.6 + uses: github/codeql-action/analyze@v2.1.7 From aeb59e0c40c2be2ebf5c3364b981377b97337a4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:07:29 +0000 Subject: [PATCH 24/50] build(deps): bump github/codeql-action from 2.1.7 to 2.1.8 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.7 to 2.1.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.7...v2.1.8) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index bed19b51..f89092e0 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.7 + uses: github/codeql-action/init@v2.1.8 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.7 + uses: github/codeql-action/autobuild@v2.1.8 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.7 + uses: github/codeql-action/analyze@v2.1.8 From 0c4d652bfbd8527055a05982814e3a84020726dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:06:44 +0000 Subject: [PATCH 25/50] build(deps): bump lombok from 1.18.22 to 1.18.24 Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.24. - [Release notes](https://github.com/projectlombok/lombok/releases) - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.24) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dac4892..3d60e267 100644 --- a/pom.xml +++ b/pom.xml @@ -287,7 +287,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.24 provided true From accf516cc2dc6befa59a137497954a00c5414fd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 10:04:45 +0000 Subject: [PATCH 26/50] build(deps-dev): bump version.mockito from 4.4.0 to 4.5.0 Bumps `version.mockito` from 4.4.0 to 4.5.0. Updates `mockito-core` from 4.4.0 to 4.5.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.0) Updates `mockito-junit-jupiter` from 4.4.0 to 4.5.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d60e267..5c7c8d52 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 8 - 4.4.0 + 4.5.0 PADLA for Java From 5d0948f3bf8a3350ce3e4c1b1a0554a2c789cad4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 10:06:39 +0000 Subject: [PATCH 27/50] build(deps): bump maven-javadoc-plugin from 3.3.2 to 3.4.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c7c8d52..4eaf4cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 ${java.version.minimal} From d601c46543cc2b77babb9ae794a87d9b63034258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:04:37 +0000 Subject: [PATCH 28/50] build(deps-dev): bump version.mockito from 4.5.0 to 4.5.1 Bumps `version.mockito` from 4.5.0 to 4.5.1. Updates `mockito-core` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.0...v4.5.1) Updates `mockito-junit-jupiter` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.0...v4.5.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4eaf4cc4..581b8ecd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 8 - 4.5.0 + 4.5.1 PADLA for Java From bdd00b5ca88317c83b1bc88fca97b49f5ba89481 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:04:38 +0000 Subject: [PATCH 29/50] build(deps): bump nexus-staging-maven-plugin from 1.6.12 to 1.6.13 Bumps nexus-staging-maven-plugin from 1.6.12 to 1.6.13. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4eaf4cc4..1c80d189 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true sonatype-ossrh From 8951f5f6a8c488ee16d0739531b847936458a38b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 10:04:41 +0000 Subject: [PATCH 30/50] build(deps): bump caffeine from 3.0.6 to 3.1.0 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 3.0.6 to 3.1.0. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.0.6...v3.1.0) --- updated-dependencies: - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7cabda35..9dfa2ce6 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ com.github.ben-manes.caffeine caffeine - 3.0.6 + 3.1.0 provided true From d69ef84b267df9d6d666bd3e1eac4c7766510417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 10:07:15 +0000 Subject: [PATCH 31/50] build(deps): bump github/codeql-action from 2.1.8 to 2.1.9 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.8 to 2.1.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.8...v2.1.9) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index f89092e0..7abe979e 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.8 + uses: github/codeql-action/init@v2.1.9 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.8 + uses: github/codeql-action/autobuild@v2.1.9 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.8 + uses: github/codeql-action/analyze@v2.1.9 From 672ce9fab00d1d8ffe014244c6dbff59cc2ccda7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 10:09:45 +0000 Subject: [PATCH 32/50] build(deps): bump github/codeql-action from 2.1.9 to 2.1.10 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.9 to 2.1.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.9...v2.1.10) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 7abe979e..ba0f6adc 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.9 + uses: github/codeql-action/init@v2.1.10 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.9 + uses: github/codeql-action/autobuild@v2.1.10 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.9 + uses: github/codeql-action/analyze@v2.1.10 From 14492495379a646e19aad09dc234b7739a6d5f82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 10:06:58 +0000 Subject: [PATCH 33/50] build(deps): bump javassist from 3.28.0-GA to 3.29.0-GA Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.28.0-GA to 3.29.0-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9dfa2ce6..f19bffa6 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ org.javassist javassist - 3.28.0-GA + 3.29.0-GA provided true From d4c6e42ed21d066e2de1f4d63120883385dcda0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 10:07:59 +0000 Subject: [PATCH 34/50] build(deps): bump github/codeql-action from 2.1.10 to 2.1.11 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.10 to 2.1.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.10...v2.1.11) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index ba0f6adc..f1c7d2be 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.10 + uses: github/codeql-action/init@v2.1.11 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.10 + uses: github/codeql-action/autobuild@v2.1.11 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.10 + uses: github/codeql-action/analyze@v2.1.11 From 8f39ae1b5a8ae04da468899d477d31349f0a1369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 May 2022 10:05:13 +0000 Subject: [PATCH 35/50] build(deps): bump caffeine from 3.1.0 to 3.1.1 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f19bffa6..fe0db251 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ com.github.ben-manes.caffeine caffeine - 3.1.0 + 3.1.1 provided true From 1d86bfbafbfcf853a98d8958b573115ddbffe58d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 10:06:29 +0000 Subject: [PATCH 36/50] build(deps-dev): bump version.mockito from 4.5.1 to 4.6.0 Bumps `version.mockito` from 4.5.1 to 4.6.0. Updates `mockito-core` from 4.5.1 to 4.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0) Updates `mockito-junit-jupiter` from 4.5.1 to 4.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe0db251..97619276 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 8 - 4.5.1 + 4.6.0 PADLA for Java From 0cc77a7261304f9b2de28f12922fbee1e8a3e6f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 10:07:38 +0000 Subject: [PATCH 37/50] build(deps): bump github/codeql-action from 2.1.11 to 2.1.12 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.11 to 2.1.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.11...v2.1.12) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index f1c7d2be..c378328b 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.11 + uses: github/codeql-action/init@v2.1.12 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.11 + uses: github/codeql-action/autobuild@v2.1.12 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.11 + uses: github/codeql-action/analyze@v2.1.12 From d065a815a1880e21849e325fc27d4a3b33f98069 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 10:19:21 +0000 Subject: [PATCH 38/50] build(deps-dev): bump version.mockito from 4.6.0 to 4.6.1 Bumps `version.mockito` from 4.6.0 to 4.6.1. Updates `mockito-core` from 4.6.0 to 4.6.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1) Updates `mockito-junit-jupiter` from 4.6.0 to 4.6.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97619276..ac99e763 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 8 - 4.6.0 + 4.6.1 PADLA for Java From 1eb87341a9dc0aaec6d98c2d215a49ee39674fec Mon Sep 17 00:00:00 2001 From: Petr Portnov | PROgrm_JARvis Date: Fri, 3 Jun 2022 19:12:32 +0300 Subject: [PATCH 39/50] feat: implement `DelegateFactory` with `Proxy` API --- .../delegate/AsmDelegateFactory.java | 52 +++++++------ .../delegate/DelegateFactories.java | 25 ++++++ .../delegate/ProxyDelegateFactory.java | 76 +++++++++++++++++++ .../javacommons/object/ObjectUtil.java | 6 ++ ...oryTest.java => DelegateFactoryTests.java} | 24 +++--- 5 files changed, 150 insertions(+), 33 deletions(-) create mode 100644 java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactories.java create mode 100644 java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java rename java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/{AsmDelegateFactoryTest.java => DelegateFactoryTests.java} (74%) diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java index 766ef029..3805bae9 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java @@ -7,7 +7,6 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; -import ru.progrm_jarvis.javacommons.annotation.Internal; import ru.progrm_jarvis.javacommons.bytecode.CommonBytecodeLibrary; import ru.progrm_jarvis.javacommons.bytecode.annotation.UsesBytecodeModification; import ru.progrm_jarvis.javacommons.bytecode.asm.AsmUtil; @@ -52,33 +51,37 @@ public final class AsmDelegateFactory extends CachingGeneratingDelegateFactory { /** * Name of the generated field in which the lazy will be stored */ - private static final @NotNull String GENERATED_INNER_LAZY_FIELD_NAME = "$" , + private static final @NotNull String GENERATED_INNER_LAZY_FIELD_NAME = "$"; + /** * Name of {@link Supplier#get()} method */ - GET_METHOD_NAME = "get" , + private static final @NotNull String GET_METHOD_NAME = "get"; + /** * Internal name of {@link Supplier} */ - SUPPLIER_INTERNAL_NAME = SUPPLIER_TYPE.getInternalName(), + private static final @NotNull String SUPPLIER_INTERNAL_NAME = SUPPLIER_TYPE.getInternalName(); + /** * Descriptor of {@link Supplier} */ - SUPPLIER_DESCRIPTOR = SUPPLIER_TYPE.getDescriptor(), + private static final @NotNull String SUPPLIER_DESCRIPTOR = SUPPLIER_TYPE.getDescriptor(); + /** * Descriptor of {@code void(}{@link Supplier}{@code )} method */ - VOID_SUPPLIER_METHOD_DESCRIPTOR = getMethodDescriptor(VOID_TYPE, SUPPLIER_TYPE); + private static final @NotNull String VOID_SUPPLIER_METHOD_DESCRIPTOR + = getMethodDescriptor(VOID_TYPE, SUPPLIER_TYPE); private AsmDelegateFactory(final @NotNull Cache<@NotNull Class, @NotNull DelegateWrapperFactory> factories) { super(factories); } /** - * Creates an {@link DelegateFactory ASM-based supplier wrapper}. - * - * @return ASM-based supplier wrapper + * Creates an ASM-based {@link DelegateFactory delegate factory}. * + * @return ASM-based delegate factory * @apiNote singleton may be used here */ public static DelegateFactory create() { @@ -94,7 +97,7 @@ public static DelegateFactory create() { try { constructor = generatedClass.getDeclaredConstructor(Supplier.class); } catch (final NoSuchMethodException e) { - throw new Error("Could not get an empty constructor of the generated class" , e); + throw new Error("Could not get an empty constructor of the generated class", e); } constructor.setAccessible(true); } @@ -103,7 +106,7 @@ public static DelegateFactory create() { try { return constructor.newInstance(supplier); } catch (final IllegalAccessException | InstantiationException | InvocationTargetException e) { - throw new Error("Cannot invoke constructor of the generated class" , e); + throw new Error("Cannot invoke constructor of the generated class", e); } }; } @@ -113,6 +116,7 @@ public static DelegateFactory create() { * * @param targetClass class for which to create a delegate-wrapper * @param type of implemented delegate-wrapper + * * @return created delegate-wrapper for the given type */ private static @NotNull Class generateWrapperClass(final @NotNull Class targetClass) { @@ -143,7 +147,7 @@ public static DelegateFactory create() { clazz.visitField( AsmUtil.OPCODES_ACC_PUBLIC_FINAL /* safe to use public here */, GENERATED_INNER_LAZY_FIELD_NAME, SUPPLIER_DESCRIPTOR, - supplierSignature = 'L' + SUPPLIER_INTERNAL_NAME + '<' + targetType.getDescriptor() + ">;" , + supplierSignature = 'L' + SUPPLIER_INTERNAL_NAME + '<' + targetType.getDescriptor() + ">;", null ).visitEnd(); // @@ -151,10 +155,12 @@ public static DelegateFactory create() { // { final MethodVisitor constructor; - (constructor = clazz.visitMethod( - ACC_PUBLIC, AsmUtil.CONSTRUCTOR_METHOD_NAME, VOID_SUPPLIER_METHOD_DESCRIPTOR, - '(' + supplierSignature + ")V" , null /* no exceptions */ - )).visitCode(); + ( + constructor = clazz.visitMethod( + ACC_PUBLIC, AsmUtil.CONSTRUCTOR_METHOD_NAME, VOID_SUPPLIER_METHOD_DESCRIPTOR, + '(' + supplierSignature + ")V", null /* no exceptions */ + ) + ).visitCode(); // push `this` onto the stack constructor.visitVarInsn(ALOAD, 0); @@ -197,10 +203,12 @@ public static DelegateFactory create() { for (var i = 0; i < parametersLength; i++) exceptions[i] = getDescriptor(exceptionTypes[i]); } - (method = clazz.visitMethod( - ACC_PUBLIC, methodName = originalMethod.getName(), - methodDescriptor = getMethodDescriptor(originalMethod), null, exceptions - )).visitVarInsn(ALOAD, 0); // push `this` onto the stack + ( + method = clazz.visitMethod( + ACC_PUBLIC, methodName = originalMethod.getName(), + methodDescriptor = getMethodDescriptor(originalMethod), null, exceptions + ) + ).visitVarInsn(ALOAD, 0); // push `this` onto the stack } // get field storing the Supplier method.visitFieldInsn(GETFIELD, internalName, GENERATED_INNER_LAZY_FIELD_NAME, SUPPLIER_DESCRIPTOR); @@ -252,11 +260,11 @@ public static DelegateFactory create() { } // - return UncheckedCasts.uncheckedClassCast(GcClassDefiners.getDefault().defineClass(LOOKUP, className, clazz.toByteArray())); + return UncheckedCasts.uncheckedClassCast( + GcClassDefiners.getDefault().defineClass(LOOKUP, className, clazz.toByteArray())); } @UtilityClass - @Internal("Safe singleton implementation using class-loading rules for achieving efficient thread-safe laziness") private static class Singleton { /** diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactories.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactories.java new file mode 100644 index 00000000..e8abe20a --- /dev/null +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactories.java @@ -0,0 +1,25 @@ +package ru.progrm_jarvis.javacommons.delegate; + +import lombok.experimental.UtilityClass; +import org.jetbrains.annotations.NotNull; +import ru.progrm_jarvis.javacommons.bytecode.CommonBytecodeLibrary; + +/** + * Utility making use of {@link DelegateFactory delegate factories} easier. + */ +@UtilityClass +public class DelegateFactories { + + /** + * Gets the best available {@link DelegateFactory delegate factory}. + * + * @return the best available {@link DelegateFactory delegate factory} + */ + public @NotNull DelegateFactory createAvailable() { + if (CommonBytecodeLibrary.ASM.isAvailable()) try { + return AsmDelegateFactory.create(); + } catch (final Throwable ignored) {} + + return ProxyDelegateFactory.create(); + } +} diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java new file mode 100644 index 00000000..8920f2b5 --- /dev/null +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java @@ -0,0 +1,76 @@ +package ru.progrm_jarvis.javacommons.delegate; + +import lombok.*; +import lombok.experimental.UtilityClass; +import org.jetbrains.annotations.NotNull; +import ru.progrm_jarvis.javacommons.object.ObjectUtil; + +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + + +/** + * Implementation of {@link DelegateFactory delegate factory} which uses runtime proxy generation via {@link Proxy}. + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ProxyDelegateFactory implements DelegateFactory { + + /** + * Creates a proxy-based {@link DelegateFactory delegate factory}. + * + * @return proxy-based delegate factory + * @apiNote singleton may be used here + */ + public static DelegateFactory create() { + return Singleton.INSTANCE; + } + + @Override + public @NotNull T createWrapper(final @NonNull Class targetType, final @NonNull Supplier supplier) { + val methodsByName = new HashMap>(); + for (val method : targetType.getDeclaredMethods()) { + val previouslyAssociatedMethod = methodsByName + .computeIfAbsent(method.getName(), key -> new HashMap<>()) + .put(new ClassArrayWrapper(method.getParameterTypes()), method); + + assert previouslyAssociatedMethod == null + : "there should be no previous method associated with the given name and type"; + } + + val objectProxy = Proxy.newProxyInstance( + targetType.getClassLoader(), + new Class[]{targetType}, + (proxy, method, arguments) -> { + if (arguments == null) arguments = ObjectUtil.EMPTY_ARRAY; + + return methodsByName + .get(method.getName()) + .get(new ClassArrayWrapper(method.getParameterTypes())) + .invoke(supplier.get(), arguments); + } + ); + + assert targetType.isInstance(objectProxy) : "target type should be assignable from the proxy instance"; + + @SuppressWarnings("unchecked") + val specificProxy = (T) objectProxy; + return specificProxy; + } + + @Value + private class ClassArrayWrapper { + Class @NotNull [] array; + } + + @UtilityClass + private static class Singleton { + + /** + * Instance of {@link AsmDelegateFactory ASM-based delegate factory} + */ + private final @NotNull DelegateFactory INSTANCE = new ProxyDelegateFactory(); + } +} diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/ObjectUtil.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/ObjectUtil.java index c42e47ea..1f315535 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/ObjectUtil.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/ObjectUtil.java @@ -5,6 +5,7 @@ import lombok.val; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Optional; import java.util.function.Function; @@ -16,6 +17,11 @@ @UtilityClass public class ObjectUtil { + /** + * Empty array of objects. + */ + public final @NotNull Object @NotNull @Unmodifiable [] EMPTY_ARRAY = new Object[0]; + /** * Returns the first nonnull value of specified variants or {@code null} if none found. * diff --git a/java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactoryTest.java b/java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactoryTests.java similarity index 74% rename from java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactoryTest.java rename to java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactoryTests.java index 7c0902d9..2f22a156 100644 --- a/java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactoryTest.java +++ b/java-commons/src/test/java/ru/progrm_jarvis/javacommons/delegate/DelegateFactoryTests.java @@ -1,25 +1,27 @@ package ru.progrm_jarvis.javacommons.delegate; import lombok.val; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import java.util.function.Supplier; +import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; -class AsmDelegateFactoryTest { +class DelegateFactoryTests { - private DelegateFactory testTarget; - - @BeforeEach - void setup() { - testTarget = AsmDelegateFactory.create(); + private static @NotNull Stream<@NotNull Arguments> provideDelegateFactoryImplementations() { + return Stream.of(ProxyDelegateFactory.create(), AsmDelegateFactory.create()) + .map(Arguments::of); } - @Test - public void testDelegateWrapperOfInterface() { + @ParameterizedTest + @MethodSource("provideDelegateFactoryImplementations") + public void testDelegateWrapperOfInterface(final @NotNull DelegateFactory delegateFactory) { val implementation = mock(SimpleInterface.class); when(implementation.getInt()).thenReturn(0xCAFEBABE); when(implementation.toString(1)).thenReturn("1"); @@ -29,7 +31,7 @@ public void testDelegateWrapperOfInterface() { @SuppressWarnings("unchecked") val factory = (Supplier) mock(Supplier.class); when(factory.get()).thenReturn(implementation); - val wrapper = testTarget.createWrapper(SimpleInterface.class, factory); + val wrapper = delegateFactory.createWrapper(SimpleInterface.class, factory); // test that no unneeded calls are done verify(factory, times(0)).get(); From f96e4e00aeaaa445081fee042e9f81faca119fda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:05:25 +0000 Subject: [PATCH 40/50] build(deps): bump maven-surefire-plugin from 3.0.0-M6 to 3.0.0-M7 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M6 to 3.0.0-M7. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M6...surefire-3.0.0-M7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac99e763..7bf8eb88 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 + 3.0.0-M7 all true From fce4c69ffeec2c4916883879cd828ea019bb4be7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 10:07:59 +0000 Subject: [PATCH 41/50] build(deps): bump github/codeql-action from 2.1.12 to 2.1.13 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.12 to 2.1.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/v2.1.13/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.12...v2.1.13) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index c378328b..07ea4b6a 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.12 + uses: github/codeql-action/init@v2.1.13 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.12 + uses: github/codeql-action/autobuild@v2.1.13 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.12 + uses: github/codeql-action/analyze@v2.1.13 From e6216cf68c6c161f8aff4e056de55f6d8b93a591 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Tue, 14 Jun 2022 00:29:43 +0300 Subject: [PATCH 42/50] build: enable Jigsaw modules This uses MultiReleaseJar to not expose `module-info` files to Java 8 clients --- .github/workflows/codeql-analysis.yaml | 4 +- .github/workflows/deploy-release.yaml | 4 +- .github/workflows/deploy-snapshot.yaml | 4 +- .github/workflows/test.yaml | 11 ++-- .../javacommons/annotation/Internal.java | 19 ------ .../classloading/ClassDefiner.java | 38 ++++++++---- .../classloading/GcClassDefiners.java | 60 +++++++++---------- .../delegate/AsmDelegateFactory.java | 30 +++++++++- .../delegate/ProxyDelegateFactory.java | 13 +++- java-commons/src/main/java9/module-info.java | 46 ++++++++++++++ pom.xml | 19 ++++++ reflector/src/main/java9/module-info.java | 9 +++ ...ractGeneratingTextModelFactoryBuilder.java | 14 ++--- .../format/model/AsmTextModelFactory.java | 23 +++++-- .../model/DebuggingTextModelFactory.java | 20 ++++--- .../model/JavassistTextModelFactory.java | 43 +++++++------ .../format/model/SimpleTextModelFactory.java | 15 ++++- .../placeholder/SimplePlaceholders.java | 14 ++--- .../util/StringMicroOptimizationUtil.java | 7 +-- .../src/main/java9/module-info.java | 25 ++++++++ 20 files changed, 288 insertions(+), 130 deletions(-) delete mode 100644 java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java create mode 100644 java-commons/src/main/java9/module-info.java create mode 100644 reflector/src/main/java9/module-info.java create mode 100644 ultimate-messenger/src/main/java9/module-info.java diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index c378328b..997a8989 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -19,10 +19,10 @@ jobs: security-events: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index b4c00f62..b3f26c1e 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 407ceb0a..907cce44 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e5f23cf8..e64e8d7e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,27 +8,28 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: '17' cache: 'maven' - name: Run tests - run: mvn -B test + # note: `package` is used instead of `test` in order to support MultiReleaseJar + run: mvn -B package check-javadocs: name: Check Javadocs runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: '17' diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java deleted file mode 100644 index b60979dd..00000000 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java +++ /dev/null @@ -1,19 +0,0 @@ -package ru.progrm_jarvis.javacommons.annotation; - -import java.lang.annotation.*; - -/** - * Marker indicating that the annotated object is part of an internal API and so (in most cases) - * should not be used by the end-user of the API. - */ -@Inherited -@Documented -public @interface Internal { - - /** - * Retrieves the reason why this API is internal. - * - * @return the reason why this API is internal - */ - String value() default ""; -} diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java index 2ae1d3a5..ce8d5d0d 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java @@ -14,16 +14,20 @@ */ public interface ClassDefiner { - /**Uns + /** + * Uns * Defines a class which may be garbage-collected. * * @param owner lookup whose access rights will be used for class definition * @param name name of the defined class * @param bytecode bytecode of the class + * * @return defined class */ - Class defineClass(@NonNull MethodHandles.Lookup owner, - @Nullable String name, byte @NonNull [] bytecode); + @NotNull Class defineClass( + MethodHandles.@NonNull Lookup owner, + @Nullable String name, byte @NonNull [] bytecode + ); /** * Defines multiple classes which may be garbage-collected. @@ -31,39 +35,51 @@ Class defineClass(@NonNull MethodHandles.Lookup owner, * @param owner lookup whose access rights will be used for class definition * @param bytecodes pairs whose first values are canonical class names * and the second values are those classes' bytecodes + * * @return defined class in the order their data was passed */ @SuppressWarnings("unchecked") - Class[] defineClasses(@NonNull MethodHandles.Lookup owner, - @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes); + @NotNull Class @NotNull [] defineClasses( + MethodHandles.@NonNull Lookup owner, + @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes + ); /** * Defines multiple classes which may be garbage-collected. * * @param owner lookup whose access rights will be used for class definition * @param bytecodes bytecodes of the classes + * * @return defined class in the order their data was passed */ - Class[] defineClasses(@NonNull MethodHandles.Lookup owner, - byte @NotNull [] @NonNull ... bytecodes); + @NotNull Class @NotNull [] defineClasses( + MethodHandles.@NonNull Lookup owner, + byte @NotNull [] @NonNull ... bytecodes + ); /** * Defines multiple classes which may be garbage-collected. * * @param owner lookup whose access rights will be used for class definition * @param bytecodes bytecodes of the classes + * * @return defined class in the order their data was passed */ - List> defineClasses(@NonNull MethodHandles.Lookup owner, - @NonNull List bytecodes); + @NotNull List<@NotNull Class> defineClasses( + MethodHandles.@NonNull Lookup owner, + @NonNull List bytecodes + ); /** * Defines multiple classes which may be garbage-collected. * * @param owner lookup whose access rights will be used for class definition * @param namedBytecode map containing bytecodes by their classes' canonical names + * * @return defined classes by their names */ - Map> defineClasses(@NonNull MethodHandles.Lookup owner, - @NonNull Map<@Nullable String, byte @NotNull []> namedBytecode); + @NotNull Map<@NotNull String, @NotNull Class> defineClasses( + MethodHandles.@NonNull Lookup owner, + @NonNull Map<@Nullable String, byte @NotNull []> namedBytecode + ); } diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/GcClassDefiners.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/GcClassDefiners.java index 5eb2067e..56468a4f 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/GcClassDefiners.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/GcClassDefiners.java @@ -7,7 +7,6 @@ import lombok.var; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.progrm_jarvis.javacommons.annotation.Internal; import ru.progrm_jarvis.javacommons.classloading.extension.LegacyClassExtensions; import ru.progrm_jarvis.javacommons.invoke.FullAccessLookupFactories; import ru.progrm_jarvis.javacommons.object.Pair; @@ -29,7 +28,7 @@ @UtilityClass public class GcClassDefiners { - private static final @NotNull ClassDefiner CLASS_DEFINER; + private final @NotNull ClassDefiner CLASS_DEFINER; static { ClassDefiner classDefiner; @@ -64,7 +63,7 @@ private static final class HiddenClassDefiner implements ClassDefiner { * Method handle referring to * {@link Lookup}{@code .defineHiddenClass(byte[], boolean, Lookup.ClassOption)} method */ - private static final MethodHandle LOOKUP__DEFINE_HIDDEN_CLASS__METHOD_HANDLE; + private static final @NotNull MethodHandle LOOKUP__DEFINE_HIDDEN_CLASS__METHOD_HANDLE; static { final Class lookupClassOptionClass; @@ -96,19 +95,23 @@ private static final class HiddenClassDefiner implements ClassDefiner { } @SuppressWarnings("unchecked") - private static > @NotNull E uncheckedEnumValueOf(final @NotNull Class type, - final @NotNull String constantName) { + private static > @NotNull E uncheckedEnumValueOf( + final @NotNull Class type, + final @NotNull String constantName + ) { return Enum.valueOf((Class) type, constantName); } @SneakyThrows // call to `MethodHandle#invokeExact(...)` - private static Class defineHiddenClass(final @NotNull Lookup owner, - final byte @NotNull [] bytecode) { + private static @NotNull Class defineHiddenClass( + final @NotNull Lookup owner, + final byte @NotNull [] bytecode + ) { return (Class) LOOKUP__DEFINE_HIDDEN_CLASS__METHOD_HANDLE.invokeExact(owner, bytecode); } @Override - public Class defineClass( + public @NotNull Class defineClass( final @NonNull Lookup owner, final @Nullable String name, final byte @NonNull [] bytecode @@ -117,7 +120,7 @@ public Class defineClass( } @Override - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final byte @NotNull [] @NonNull ... bytecodes ) { @@ -130,7 +133,7 @@ public Class[] defineClasses( } @Override - public List> defineClasses( + public @NotNull List<@NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull List bytecodes ) { @@ -143,7 +146,7 @@ public List> defineClasses( @Override @SuppressWarnings("unchecked") - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes ) { @@ -156,7 +159,7 @@ public Class[] defineClasses( } @Override - public Map> defineClasses( + public @NotNull Map<@NotNull String, @NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull Map namedBytecode ) { @@ -231,15 +234,17 @@ private static final class UnsafeClassDefiner implements ClassDefiner { } @SneakyThrows // call to `MethodHandle#invokeExact(...)` - private static Class defineAnonymousClass(final @NotNull Class owner, - final byte @NotNull [] bytecode) { + private static @NotNull Class defineAnonymousClass( + final @NotNull Class owner, + final byte @NotNull [] bytecode + ) { return (Class) UNSAFE__DEFINE_ANONYMOUS_CLASS__METHOD_HANDLE.invokeExact( owner, bytecode ); } @Override - public Class defineClass( + public @NotNull Class defineClass( final @NonNull Lookup owner, final @Nullable String name, final byte @NonNull [] bytecode @@ -248,7 +253,7 @@ public Class defineClass( } @Override - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final byte @NotNull [] @NonNull ... bytecodes ) { @@ -262,7 +267,7 @@ public Class[] defineClasses( } @Override - public List> defineClasses( + public @NotNull List<@NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull List bytecodes ) { @@ -276,7 +281,7 @@ public List> defineClasses( @Override @SuppressWarnings("unchecked") - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes ) { @@ -290,7 +295,7 @@ public Class[] defineClasses( } @Override - public Map> defineClasses( + public @NotNull Map<@NotNull String, @NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull Map namedBytecode ) { @@ -312,7 +317,7 @@ public Map> defineClasses( private static final class TmpClassLoaderClassDefiner implements ClassDefiner { @Override - public Class defineClass( + public @NotNull Class defineClass( final @NonNull Lookup owner, final @Nullable String name, final byte @NonNull [] bytecode @@ -321,7 +326,7 @@ public Class defineClass( } @Override - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final byte @NotNull [] @NonNull ... bytecodes ) { @@ -335,7 +340,7 @@ public Class[] defineClasses( } @Override - public List> defineClasses( + public @NotNull List<@NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull List bytecodes ) { @@ -349,7 +354,7 @@ public List> defineClasses( @Override @SuppressWarnings("unchecked") - public Class[] defineClasses( + public @NotNull Class @NotNull [] defineClasses( final @NonNull Lookup owner, final @NotNull Pair<@Nullable String, byte @NotNull []> @NonNull ... bytecodes ) { @@ -366,7 +371,7 @@ public Class[] defineClasses( } @Override - public Map> defineClasses( + public @NotNull Map<@NotNull String, @NotNull Class> defineClasses( final @NonNull Lookup owner, final @NonNull Map<@Nullable String, byte @NotNull []> namedBytecode ) { @@ -384,10 +389,6 @@ public Map> defineClasses( /** * Temporary class-loader which should be instantiated for groups of related classes which may be unloaded. */ - @Internal( - "This class-loader is intended only for internal usage and should never be accessed outside " - + "as there should be no strong references to it" - ) private static final class TmpClassLoader extends ClassLoader { /** @@ -406,8 +407,7 @@ private TmpClassLoader(final ClassLoader parent) { * @param bytecode bytecode of the class * @return defined class */ - private Class define(final @Nullable String name, - final byte @NotNull [] bytecode) { + private @NotNull Class define(final @Nullable String name, final byte @NotNull [] bytecode) { return defineClass(name, bytecode, 0, bytecode.length); } } diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java index 3805bae9..e01f55db 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/AsmDelegateFactory.java @@ -3,6 +3,7 @@ import lombok.experimental.UtilityClass; import lombok.val; import lombok.var; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; @@ -20,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; import java.util.function.Supplier; import static org.objectweb.asm.Opcodes.*; @@ -78,6 +80,17 @@ private AsmDelegateFactory(final @NotNull Cache<@NotNull Class, @NotNull Dele super(factories); } + /** + * Creates a {@link Proxy}-based {@link DelegateFactory delegate factory}. + * + * @publicForSpi {@link #create() preferred creation method} + */ + @ApiStatus.Internal + @SuppressWarnings("PublicConstructor") // SPI API + public AsmDelegateFactory() { + this(SharedCache.INSTANCE); + } + /** * Creates an ASM-based {@link DelegateFactory delegate factory}. * @@ -264,14 +277,25 @@ public static DelegateFactory create() { GcClassDefiners.getDefault().defineClass(LOOKUP, className, clazz.toByteArray())); } + @UtilityClass + private static class SharedCache { + + /** + * Shared cache instance to be used by {@link Singleton#INSTANCE} + * and all instances created via SPI {@link AsmDelegateFactory#AsmDelegateFactory()}. + * + * @apiNote classes are GC-friendly loaded so they may be effectively weakly-referenced + */ + private final @NotNull Cache<@NotNull Class, @NotNull DelegateWrapperFactory> INSTANCE + = Caches.weakKeysCache(); + } + @UtilityClass private static class Singleton { /** * Instance of {@link AsmDelegateFactory ASM-based delegate factory} */ - private final @NotNull DelegateFactory INSTANCE = new AsmDelegateFactory( - Caches.weakKeysCache() // classes are GC-friendly loaded so they may be effectively weakly-referenced - ); + private final @NotNull DelegateFactory INSTANCE = new AsmDelegateFactory(SharedCache.INSTANCE); } } diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java index 8920f2b5..599c2c60 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/delegate/ProxyDelegateFactory.java @@ -2,6 +2,7 @@ import lombok.*; import lombok.experimental.UtilityClass; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import ru.progrm_jarvis.javacommons.object.ObjectUtil; @@ -15,16 +16,24 @@ /** * Implementation of {@link DelegateFactory delegate factory} which uses runtime proxy generation via {@link Proxy}. */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ProxyDelegateFactory implements DelegateFactory { + /** + * Creates a {@link Proxy}-based {@link DelegateFactory delegate factory}. + * + * @publicForSpi {@link #create() preferred creation method} + */ + @ApiStatus.Internal + @SuppressWarnings("PublicConstructor") // SPI API + public ProxyDelegateFactory() {} + /** * Creates a proxy-based {@link DelegateFactory delegate factory}. * * @return proxy-based delegate factory * @apiNote singleton may be used here */ - public static DelegateFactory create() { + public static @NotNull DelegateFactory create() { return Singleton.INSTANCE; } diff --git a/java-commons/src/main/java9/module-info.java b/java-commons/src/main/java9/module-info.java new file mode 100644 index 00000000..538529e1 --- /dev/null +++ b/java-commons/src/main/java9/module-info.java @@ -0,0 +1,46 @@ +import ru.progrm_jarvis.javacommons.delegate.AsmDelegateFactory; +import ru.progrm_jarvis.javacommons.delegate.DelegateFactory; +import ru.progrm_jarvis.javacommons.delegate.ProxyDelegateFactory; + +module ru.progrm_jarvis.javacommons { + // optional dependencies + requires org.objectweb.asm; + requires javassist; + + requires static lombok; + requires static org.jetbrains.annotations; + + exports ru.progrm_jarvis.javacommons.annotation; + exports ru.progrm_jarvis.javacommons.bytecode; + exports ru.progrm_jarvis.javacommons.bytecode.annotation; + exports ru.progrm_jarvis.javacommons.bytecode.asm; + exports ru.progrm_jarvis.javacommons.cache; + exports ru.progrm_jarvis.javacommons.classloading; + exports ru.progrm_jarvis.javacommons.classloading.extension; + exports ru.progrm_jarvis.javacommons.collection; + exports ru.progrm_jarvis.javacommons.collection.concurrent; + exports ru.progrm_jarvis.javacommons.data; + exports ru.progrm_jarvis.javacommons.delegate; + exports ru.progrm_jarvis.javacommons.invoke; + exports ru.progrm_jarvis.javacommons.io.wrapper; + exports ru.progrm_jarvis.javacommons.lazy; + exports ru.progrm_jarvis.javacommons.object; + exports ru.progrm_jarvis.javacommons.object.extension; + exports ru.progrm_jarvis.javacommons.object.valuestorage; + exports ru.progrm_jarvis.javacommons.ownership.annotation; + exports ru.progrm_jarvis.javacommons.primitive; + exports ru.progrm_jarvis.javacommons.primitive.error; + exports ru.progrm_jarvis.javacommons.primitive.wrapper; + exports ru.progrm_jarvis.javacommons.random; + exports ru.progrm_jarvis.javacommons.range; + exports ru.progrm_jarvis.javacommons.recursion; + exports ru.progrm_jarvis.javacommons.service; + exports ru.progrm_jarvis.javacommons.unsafe; + exports ru.progrm_jarvis.javacommons.util; + exports ru.progrm_jarvis.javacommons.util.concurrent; + exports ru.progrm_jarvis.javacommons.util.function; + exports ru.progrm_jarvis.javacommons.util.stream; + exports ru.progrm_jarvis.javacommons.util.stream.extension; + + provides DelegateFactory with ProxyDelegateFactory, AsmDelegateFactory; +} diff --git a/pom.xml b/pom.xml index 7bf8eb88..a7795c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,20 @@ + + + java-9 + + compile + + + 9 + true + + ${project.basedir}/src/main/java9 + + + java-11 @@ -204,6 +218,11 @@ a Implementation specification + + publicForSpi + c + This constructor is only visible for Java SPI consider using + diff --git a/reflector/src/main/java9/module-info.java b/reflector/src/main/java9/module-info.java new file mode 100644 index 00000000..66f770de --- /dev/null +++ b/reflector/src/main/java9/module-info.java @@ -0,0 +1,9 @@ +module ru.progrm_jarvis.reflector { + requires transitive ru.progrm_jarvis.javacommons; + + requires static lombok; + requires static org.jetbrains.annotations; + + exports ru.progrm_jarvis.reflector.wrapper; + exports ru.progrm_jarvis.reflector.wrapper.invoke; +} diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AbstractGeneratingTextModelFactoryBuilder.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AbstractGeneratingTextModelFactoryBuilder.java index 1f28a700..eb30e7b0 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AbstractGeneratingTextModelFactoryBuilder.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AbstractGeneratingTextModelFactoryBuilder.java @@ -30,13 +30,6 @@ public abstract class AbstractGeneratingTextModelFactoryBuilder> extends AbstractCachingTextModelFactoryBuilder { - /** - * Instantiates new abstract generating text model factory builder using {@link ArrayList} for its backend. - */ - protected AbstractGeneratingTextModelFactoryBuilder() { - this(new ArrayList<>()); - } - /** * Nodes of the text model */ @@ -60,6 +53,13 @@ protected AbstractGeneratingTextModelFactoryBuilder() { */ @NonFinal transient N lastNode; + /** + * Instantiates new abstract generating text model factory builder using {@link ArrayList} for its backend. + */ + protected AbstractGeneratingTextModelFactoryBuilder() { + this(new ArrayList<>()); + } + /** * Ends the modification of ta static node. * diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AsmTextModelFactory.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AsmTextModelFactory.java index c23b0ff7..f501cea4 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AsmTextModelFactory.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/AsmTextModelFactory.java @@ -7,7 +7,6 @@ import lombok.extern.java.Log; import org.jetbrains.annotations.*; import org.objectweb.asm.*; -import ru.progrm_jarvis.javacommons.annotation.Internal; import ru.progrm_jarvis.javacommons.bytecode.CommonBytecodeLibrary; import ru.progrm_jarvis.javacommons.bytecode.annotation.UsesBytecodeModification; import ru.progrm_jarvis.javacommons.bytecode.asm.AsmUtil; @@ -36,14 +35,13 @@ * * which uses runtime class generation via ASM. * * @param type of object according to which the created text models are formatted - * @param type of configuration used by this text model factory */ @Log @ToString @RequiredArgsConstructor(access = AccessLevel.PRIVATE) @UsesBytecodeModification(CommonBytecodeLibrary.ASM) @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) -public final class AsmTextModelFactory implements TextModelFactory { +public final class AsmTextModelFactory implements TextModelFactory { /** * Lazy singleton of this text model factory */ @@ -91,7 +89,20 @@ public final class AsmTextModelFactory newBuilder() { + public TextModelFactory.@NotNull TextModelBuilder newBuilder() { return new AsmTextModelBuilder<>(configuration); } @@ -522,7 +533,7 @@ protected void endModification(final @NotNull StaticAsmNode staticNode) { * @deprecated this method is internal */ @Deprecated - @Internal("This is expected to be invoked only by generated TextModels to initialize their fields") + @ApiStatus.Internal public static @NotNull TextModel internal$getDynamicTextModel(final @NotNull String uniqueKey) { return DYNAMIC_MODELS.retrieveValue(uniqueKey); } diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/DebuggingTextModelFactory.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/DebuggingTextModelFactory.java index fef196dd..9c32f067 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/DebuggingTextModelFactory.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/DebuggingTextModelFactory.java @@ -24,12 +24,12 @@ public final class DebuggingTextModelFactory implements TextModelFactory { /** * Text model factory who is used for actual logic implementation */ - @NonNull TextModelFactory textModelFactory; + @NotNull TextModelFactory textModelFactory; /** * Handler accepting debug messages on each method called */ - @NonNull Consumer debugHandler; + @NotNull Consumer<@NotNull String> debugHandler; /** * Creates a new debugging {@link TextModel text model factory}. @@ -39,8 +39,10 @@ public final class DebuggingTextModelFactory implements TextModelFactory { * @param type of object according to which the created text models are formatted * @return created text model factory */ - public static @NotNull TextModelFactory create(final @NonNull TextModelFactory textModelFactory, - final @NonNull Consumer debugHandler) { + public static @NotNull TextModelFactory create( + final @NonNull TextModelFactory textModelFactory, + final @NonNull Consumer<@NotNull String> debugHandler + ) { return new DebuggingTextModelFactory<>(textModelFactory, debugHandler); } @@ -52,7 +54,7 @@ public final class DebuggingTextModelFactory implements TextModelFactory { } @Override - public @NotNull TextModelFactory.TextModelBuilder newBuilder() { + public TextModelFactory.@NotNull TextModelBuilder newBuilder() { debugHandler.accept("TextModelFactory#newBuilder()"); return new DebuggingTextModelBuilder(textModelFactory.newBuilder()); @@ -62,10 +64,10 @@ public final class DebuggingTextModelFactory implements TextModelFactory { @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true) private final class DebuggingTextModelBuilder implements TextModelFactory.TextModelBuilder { - @NonNull TextModelFactory.TextModelBuilder textModelBuilder; + TextModelFactory.@NotNull TextModelBuilder textModelBuilder; @Override - public @NotNull TextModelFactory.TextModelBuilder append(final @NonNull String staticText) { + public TextModelFactory.@NotNull TextModelBuilder append(final @NonNull String staticText) { debugHandler.accept( "TextModelBuilder#append(\"" + StringMicroOptimizationUtil.escapeJavaStringLiteral(staticText) + "\")" @@ -75,14 +77,14 @@ private final class DebuggingTextModelBuilder implements TextModelFactory.TextMo } @Override - public @NotNull TextModelFactory.TextModelBuilder append(final @NonNull TextModel dynamicText) { + public TextModelFactory.@NotNull TextModelBuilder append(final @NonNull TextModel dynamicText) { debugHandler.accept("TextModelBuilder#append(" + dynamicText + ')'); return textModelBuilder.append(dynamicText); } @Override - public @NotNull TextModelFactory.TextModelBuilder clear() { + public TextModelFactory.@NotNull TextModelBuilder clear() { debugHandler.accept("TextModelBuilder#clear()"); return textModelBuilder.clear(); diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/JavassistTextModelFactory.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/JavassistTextModelFactory.java index c11f2ba9..a5307248 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/JavassistTextModelFactory.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/JavassistTextModelFactory.java @@ -3,8 +3,8 @@ import javassist.*; import lombok.*; import lombok.experimental.FieldDefaults; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -import ru.progrm_jarvis.javacommons.annotation.Internal; import ru.progrm_jarvis.javacommons.bytecode.CommonBytecodeLibrary; import ru.progrm_jarvis.javacommons.bytecode.annotation.UsesBytecodeModification; import ru.progrm_jarvis.javacommons.classloading.ClassNamingStrategy; @@ -27,7 +27,6 @@ * Implementation of {@link TextModelFactory text model factory} * which uses runtime class generation via Javasssist. */ -@RequiredArgsConstructor(access = AccessLevel.PRIVATE) @UsesBytecodeModification(CommonBytecodeLibrary.JAVASSIST) public final class JavassistTextModelFactory implements TextModelFactory { @@ -37,6 +36,15 @@ public final class JavassistTextModelFactory implements TextModelFactory { private static final @NotNull Lazy<@NotNull TextModelFactory> INSTANCE = Lazy.createThreadSafe(JavassistTextModelFactory::new); + /** + * Creates a Javassist-based {@link TextModelFactory text model factory}. + * + * @publicForSpi {@link #create() preferred creation method} + */ + @ApiStatus.Internal + @SuppressWarnings({"PublicConstructor", "RedundantNoArgConstructor"}) // SPI API + public JavassistTextModelFactory() {} + /** * Creates a Javassist-based {@link TextModelFactory text model factory}. * @@ -51,7 +59,7 @@ public final class JavassistTextModelFactory implements TextModelFactory { } @Override - public @NotNull TextModelFactory.TextModelBuilder newBuilder() { + public TextModelFactory.@NotNull TextModelBuilder newBuilder() { return new JavassistTextModelBuilder<>(); } @@ -79,25 +87,15 @@ protected static final class JavassistTextModelBuilder */ private static final @NotNull MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); - @Override - protected @NotNull Node> newStaticNode(final @NotNull String text) { - return new SimpleStaticNode<>(text); - } - - @Override - protected @NotNull Node> newDynamicNode(final @NotNull TextModel content) { - return new SimpleDynamicNode<>(content); - } - /** * Full name (including canonical class name) of {@link #internal$getDynamicTextModel(String)} method */ private static final @NotNull String INTERNAL_GET_DYNAMIC_TEXT_MODEL_METHOD_FULL_NAME - = JavassistTextModelBuilder.class.getCanonicalName() + ".internal$getDynamicTextModel", + = JavassistTextModelBuilder.class.getCanonicalName() + ".internal$getDynamicTextModel"; /** * Prefix of generated fields after which the index will go */ - GENERATED_FIELD_NAME_PREFIX = "D"; + private static final @NotNull String GENERATED_FIELD_NAME_PREFIX = "D"; /** * Internal storage of {@link TextModel dynamic text models} passed to {@code static final} fields. @@ -108,7 +106,8 @@ protected static final class JavassistTextModelBuilder /** * Lazily initialized {@link ClassPool Javassist class pool} */ - private static final @NotNull Lazy<@NotNull ClassPool> CLASS_POOL = Lazy.createThreadSafe(ClassPool::getDefault); + private static final @NotNull Lazy<@NotNull ClassPool> CLASS_POOL + = Lazy.createThreadSafe(ClassPool::getDefault); /** * Lazily initialized {@link CtClass compile-time class} of {@link TextModel text model} @@ -134,6 +133,16 @@ protected static final class JavassistTextModelBuilder JavassistTextModelBuilder.class.getName() + "$$Generated$$TextModel$$" ); + @Override + protected @NotNull Node> newStaticNode(final @NotNull String text) { + return new SimpleStaticNode<>(text); + } + + @Override + protected @NotNull Node> newDynamicNode(final @NotNull TextModel content) { + return new SimpleDynamicNode<>(content); + } + /** * Retrieves (gets and removes) {@link TextModel dynamic text model} * stored in {@link #DYNAMIC_MODELS} by the given key. @@ -143,7 +152,7 @@ protected static final class JavassistTextModelBuilder * @deprecated this method is internal */ @Deprecated - @Internal("This is expected to be invoked only by generated TextModels to initialize their fields") + @ApiStatus.Internal public static @NotNull TextModel internal$getDynamicTextModel(final @NotNull String uniqueKey) { return DYNAMIC_MODELS.retrieveValue(uniqueKey); } diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/SimpleTextModelFactory.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/SimpleTextModelFactory.java index 0d24a0a6..69248c03 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/SimpleTextModelFactory.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/model/SimpleTextModelFactory.java @@ -3,6 +3,7 @@ import lombok.*; import lombok.experimental.FieldDefaults; import lombok.experimental.NonFinal; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import ru.progrm_jarvis.javacommons.lazy.Lazy; @@ -12,15 +13,23 @@ /** * Simple implementation of {@link TextModelFactory text model factory}. */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class SimpleTextModelFactory implements TextModelFactory { /** * Lazy singleton of this text model factory */ - private static final Lazy> INSTANCE + private static final @NotNull Lazy<@NotNull TextModelFactory> INSTANCE = Lazy.createThreadSafe(SimpleTextModelFactory::new); + /** + * Creates a simple {@link TextModelFactory text model factory}. + * + * @publicForSpi {@link #create() preferred creation method} + */ + @ApiStatus.Internal + @SuppressWarnings({"PublicConstructor", "RedundantNoArgConstructor"}) // SPI API + public SimpleTextModelFactory() {} + /** * Creates a simple {@link TextModelFactory text model factory}. * @@ -35,7 +44,7 @@ public final class SimpleTextModelFactory implements TextModelFactory { } @Override - public @NotNull TextModelFactory.TextModelBuilder newBuilder() { + public TextModelFactory.@NotNull TextModelBuilder newBuilder() { return new SimpleTextModelBuilder<>(); } diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/placeholder/SimplePlaceholders.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/placeholder/SimplePlaceholders.java index 98eb7207..660650c5 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/placeholder/SimplePlaceholders.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/placeholder/SimplePlaceholders.java @@ -82,7 +82,7 @@ public final class SimplePlaceholders implements Placeholders { @Builder.Default @NonNull String unknownPlaceholderReplacement = ""; @Override - public @NotNull String format(@NotNull String source, final T target) { + public @NotNull String format(final @NotNull String source, final T target) { if (source.isEmpty()) return source; @Nullable StringBuilder result = null; @@ -200,8 +200,8 @@ else if (character == suffix) { // handle end of placeholder boolean escaping = false, inPlaceholder = false; @Nullable StringBuilder lastRawText = null; // currently read text or int lastFlushIndex = -1, // index of the last flushed (written) character - placeholderStartIndex = -1 // index at which the currently scanned placeholder starts - , // index of the delimiter contextually + placeholderStartIndex = -1, // index at which the currently scanned placeholder starts + // index of the delimiter contextually escapeCount = 0; // amount of escapes inside the placeholder val length = characters.length; for (var index = 0; index < length; index++) { @@ -214,8 +214,7 @@ else if (character == suffix) { // make sure this is a placeholder if (index == placeholderStartIndex + 1) break format; // it was not a placeholder ... // ... but just a sequence "PrefSuf" - String value;/* also reused as placeholder key */ - String placeholder; + String value /* also reused as placeholder key */, placeholder; if (index == placeholderStartIndex + 2) { // rare case val singleChar = text.charAt(index - 1); @@ -226,10 +225,9 @@ else if (character == suffix) { } else { placeholder = text.substring(placeholderStartIndex + 1, index); if (escapeCount > 0) { - StringBuilder unescapedPlaceholder = new StringBuilder( + val unescapedPlaceholder = new StringBuilder( placeholder.length() + escapeCount); - for (val placeholderChar : placeholder.toCharArray()) - if (placeholderChar + for (val placeholderChar : placeholder.toCharArray()) if (placeholderChar != escapeCharacter) unescapedPlaceholder.append(placeholderChar); placeholder = unescapedPlaceholder.toString(); } diff --git a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/util/StringMicroOptimizationUtil.java b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/util/StringMicroOptimizationUtil.java index f179f923..3d9c2f9f 100644 --- a/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/util/StringMicroOptimizationUtil.java +++ b/ultimate-messenger/src/main/java/ru/progrm_jarvis/ultimatemessenger/format/util/StringMicroOptimizationUtil.java @@ -6,7 +6,6 @@ import lombok.val; import lombok.var; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import ru.progrm_jarvis.javacommons.invoke.InvokeUtil; import java.lang.invoke.MethodHandle; @@ -23,7 +22,7 @@ public class StringMicroOptimizationUtil { /** * Name of the field of class {@link String} which holds its chars (according to OpenJDK sources) */ - private final String STRING_VALUE_FIELD_NAME = "value"; + private final @NotNull String STRING_VALUE_FIELD_NAME = "value"; /** * Method handle for accessing {@link String}{@code .}{@value #STRING_VALUE_FIELD_NAME} if it is possible */ @@ -66,8 +65,8 @@ public class StringMicroOptimizationUtil { * @param source source {@link String string} * @return valid value for copying into {@link String string literal} {@code "}s */ - public String escapeJavaStringLiteral(final @NonNull String source) { - @Nullable StringBuilder result = null; + public @NotNull String escapeJavaStringLiteral(final @NonNull String source) { + StringBuilder result = null; val characters = getStringChars(source); int lastWriteIndex = -1; val length = characters.length; diff --git a/ultimate-messenger/src/main/java9/module-info.java b/ultimate-messenger/src/main/java9/module-info.java new file mode 100644 index 00000000..94593223 --- /dev/null +++ b/ultimate-messenger/src/main/java9/module-info.java @@ -0,0 +1,25 @@ +import ru.progrm_jarvis.ultimatemessenger.format.model.AsmTextModelFactory; +import ru.progrm_jarvis.ultimatemessenger.format.model.JavassistTextModelFactory; +import ru.progrm_jarvis.ultimatemessenger.format.model.SimpleTextModelFactory; +import ru.progrm_jarvis.ultimatemessenger.format.model.TextModelFactory; + +module ru.progrm_jarvis.ultimatemessenger { + + requires transitive ru.progrm_jarvis.javacommons; + + requires java.logging; + // optional dependencies + requires org.objectweb.asm; + requires javassist; + + requires static lombok; + requires static org.jetbrains.annotations; + + exports ru.progrm_jarvis.ultimatemessenger.format; + exports ru.progrm_jarvis.ultimatemessenger.format.model; + exports ru.progrm_jarvis.ultimatemessenger.format.placeholder; + exports ru.progrm_jarvis.ultimatemessenger.format.util; + exports ru.progrm_jarvis.ultimatemessenger.message; + + provides TextModelFactory with SimpleTextModelFactory, AsmTextModelFactory, JavassistTextModelFactory; +} From d79daf5c5e5c954311ff49306e6d246ebb59f0be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 12:29:06 +0000 Subject: [PATCH 43/50] build(deps): bump github/codeql-action from 2.1.13 to 2.1.14 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.13 to 2.1.14. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.13...v2.1.14) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index a3beff9e..a1b0aa32 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.13 + uses: github/codeql-action/init@v2.1.14 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.13 + uses: github/codeql-action/autobuild@v2.1.14 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.13 + uses: github/codeql-action/analyze@v2.1.14 From 184a7edfeac696c73f89d5b0754b6495b8bd5e0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 12:29:09 +0000 Subject: [PATCH 44/50] build(deps): bump actions/setup-java from 3.3.0 to 3.4.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index a3beff9e..0f3fad28 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index b3f26c1e..cc0ee454 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 907cce44..9a21f0e9 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e64e8d7e..112df70d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: distribution: 'zulu' java-version: '17' @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: distribution: 'zulu' java-version: '17' From 7a50874d03dc2162006740487f230fa1cfcb0bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:10:13 +0000 Subject: [PATCH 45/50] build(deps): bump github/codeql-action from 2.1.14 to 2.1.15 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.14 to 2.1.15. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.14...v2.1.15) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index eb45599a..117ed513 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.14 + uses: github/codeql-action/init@v2.1.15 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.14 + uses: github/codeql-action/autobuild@v2.1.15 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.14 + uses: github/codeql-action/analyze@v2.1.15 From c413eaa2874d74fa6360a22addb7677d41ee7327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 10:10:11 +0000 Subject: [PATCH 46/50] build(deps): bump jactions/maven-version from 1.0.0 to 1.0.1 Bumps [jactions/maven-version](https://github.com/jactions/maven-version) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/jactions/maven-version/releases) - [Commits](https://github.com/jactions/maven-version/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: jactions/maven-version dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index cc0ee454..bae5ad05 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -24,7 +24,7 @@ jobs: gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }} gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE - - uses: jactions/maven-version@v1.0.0 + - uses: jactions/maven-version@v1.0.1 id: get_version - name: Deploy release diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 9a21f0e9..ee63090b 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -24,7 +24,7 @@ jobs: gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }} gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE - - uses: jactions/maven-version@v1.0.0 + - uses: jactions/maven-version@v1.0.1 id: get_version - name: Deploy snapshot From 4720039481d73d715c3ee32d1b73984d060ef8a2 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Tue, 8 Feb 2022 00:31:43 +0300 Subject: [PATCH 47/50] build: bump version to 1.0.0-rc.9 --- SECURITY.md | 6 +++--- java-commons/pom.xml | 2 +- padla-bom/pom.xml | 8 ++++---- pom.xml | 2 +- reflector/pom.xml | 2 +- ultimate-messenger/pom.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index a8d1f881..2ee59481 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,9 +3,9 @@ ## Supported Versions | Version | Supported | -| ------------ | ------------------ | -| [1.0.0-rc.8] | :heavy_check_mark: | -| < 1.0.0-rc.8 | :x: | +|--------------| ------------------ | +| [1.0.0-rc.9] | :heavy_check_mark: | +| < 1.0.0-rc.9 | :x: | ## Reporting a Vulnerability diff --git a/java-commons/pom.xml b/java-commons/pom.xml index ed5b8f96..fa01cdcd 100644 --- a/java-commons/pom.xml +++ b/java-commons/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.9 java-commons diff --git a/padla-bom/pom.xml b/padla-bom/pom.xml index f9c59a21..a905055a 100644 --- a/padla-bom/pom.xml +++ b/padla-bom/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.9 padla-bom pom @@ -20,17 +20,17 @@ ru.progrm-jarvis java-commons - 1.0.0-SNAPSHOT + 1.0.0-rc.9 ru.progrm-jarvis reflector - 1.0.0-SNAPSHOT + 1.0.0-rc.9 ru.progrm-jarvis ultimate-messenger - 1.0.0-SNAPSHOT + 1.0.0-rc.9 diff --git a/pom.xml b/pom.xml index a7795c2f..a951e678 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.9 java-commons reflector diff --git a/reflector/pom.xml b/reflector/pom.xml index ad2dea06..3c678da5 100644 --- a/reflector/pom.xml +++ b/reflector/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.9 reflector diff --git a/ultimate-messenger/pom.xml b/ultimate-messenger/pom.xml index 9ce5b93f..f7668e97 100644 --- a/ultimate-messenger/pom.xml +++ b/ultimate-messenger/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.9 ultimate-messenger From 83c0cee0d9bc43af5434bc6e98180b90a9af6914 Mon Sep 17 00:00:00 2001 From: Cheryl <68248402+Cheryl-des@users.noreply.github.com> Date: Mon, 14 Feb 2022 21:24:05 +0200 Subject: [PATCH 48/50] build: remove redundant `dependencies` from `nexus-staging-maven-plugin` configuration --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index a951e678..379d66f6 100644 --- a/pom.xml +++ b/pom.xml @@ -236,19 +236,6 @@ https://oss.sonatype.org/ true - - - - com.thoughtworks.xstream - xstream - 1.4.17 - - - org.ogce - xpp3 - 1.1.6 - - From 96a5db91a4820e29b26d09b6ef9363ac3dbdb00a Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Fri, 1 Jul 2022 16:50:34 +0300 Subject: [PATCH 49/50] build: add separate `padla-parent` module This is done to minimize dependencies in `padla-bom --- java-commons/pom.xml | 7 +++- padla-bom/pom.xml | 8 ++-- padla-parent/pom.xml | 77 +++++++++++++++++++++++++++++++++++++ pom.xml | 79 +++++++------------------------------- reflector/pom.xml | 5 ++- ultimate-messenger/pom.xml | 5 ++- 6 files changed, 106 insertions(+), 75 deletions(-) create mode 100644 padla-parent/pom.xml diff --git a/java-commons/pom.xml b/java-commons/pom.xml index fa01cdcd..4b915a9a 100644 --- a/java-commons/pom.xml +++ b/java-commons/pom.xml @@ -5,8 +5,9 @@ 4.0.0 ru.progrm-jarvis - padla - 1.0.0-rc.9 + padla-parent + 1.0.0-SNAPSHOT + ../padla-parent java-commons @@ -61,10 +62,12 @@ org.hamcrest hamcrest-all + test org.mockito mockito-core + test diff --git a/padla-bom/pom.xml b/padla-bom/pom.xml index a905055a..f9c59a21 100644 --- a/padla-bom/pom.xml +++ b/padla-bom/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-rc.9 + 1.0.0-SNAPSHOT padla-bom pom @@ -20,17 +20,17 @@ ru.progrm-jarvis java-commons - 1.0.0-rc.9 + 1.0.0-SNAPSHOT ru.progrm-jarvis reflector - 1.0.0-rc.9 + 1.0.0-SNAPSHOT ru.progrm-jarvis ultimate-messenger - 1.0.0-rc.9 + 1.0.0-SNAPSHOT diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml new file mode 100644 index 00000000..e8190b83 --- /dev/null +++ b/padla-parent/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + ru.progrm-jarvis + padla + 1.0.0-SNAPSHOT + + padla-parent + pom + + PADLA parent + Parent module of PADLA components, this is not intended for use as a dependency + + + ../java-commons + ../reflector + ../ultimate-messenger + + + + + + + ${project.groupId} + java-commons + ${project.version} + + + + + + + org.projectlombok + lombok + 1.18.24 + provided + true + + + + + org.jetbrains + annotations + 23.0.0 + provided + true + + + + + + + org.junit + junit-bom + 5.8.2 + pom + import + + + org.mockito + mockito-bom + 4.6.1 + pom + import + + + + org.hamcrest + hamcrest-all + 1.3 + + + + diff --git a/pom.xml b/pom.xml index 379d66f6..553e74a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,24 +5,20 @@ 4.0.0 ru.progrm-jarvis padla - 1.0.0-rc.9 + 1.0.0-SNAPSHOT - java-commons - reflector - ultimate-messenger padla-bom + padla-parent pom UTF-8 8 - - 4.6.1 PADLA for Java - Pack of Java utilities for various needs + Pack of Java utilities for various needs, this is not intended for use as a dependency https://padla.progrm-jarvis.ru/ 2019 @@ -72,7 +68,12 @@ - verify install + + + package + + install + @@ -243,17 +244,10 @@ - - - ${project.groupId} - java-commons - ${project.version} - - - ${project.groupId} - reflector - ${project.version} - + @@ -262,16 +256,9 @@ 9.3 pom import - - - org.junit - junit-bom - 5.8.2 - pom - import + true - com.github.ben-manes.caffeine @@ -288,44 +275,6 @@ provided true - - - - org.projectlombok - lombok - 1.18.24 - provided - true - - - - - org.jetbrains - annotations - 23.0.0 - provided - true - - - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.mockito - mockito-core - ${version.mockito} - test - - - org.mockito - mockito-junit-jupiter - ${version.mockito} - test - diff --git a/reflector/pom.xml b/reflector/pom.xml index 3c678da5..e55f0bea 100644 --- a/reflector/pom.xml +++ b/reflector/pom.xml @@ -5,8 +5,9 @@ 4.0.0 ru.progrm-jarvis - padla - 1.0.0-rc.9 + padla-parent + 1.0.0-SNAPSHOT + ../padla-parent reflector diff --git a/ultimate-messenger/pom.xml b/ultimate-messenger/pom.xml index f7668e97..87c8fb70 100644 --- a/ultimate-messenger/pom.xml +++ b/ultimate-messenger/pom.xml @@ -5,8 +5,9 @@ 4.0.0 ru.progrm-jarvis - padla - 1.0.0-rc.9 + padla-parent + 1.0.0-SNAPSHOT + ../padla-parent ultimate-messenger From de467f47714764368d299a67331b1ddb3ebebbbe Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Fri, 1 Jul 2022 17:05:11 +0300 Subject: [PATCH 50/50] build: bump version to 1.0.0-rc.10 --- SECURITY.md | 13 +++++++------ java-commons/pom.xml | 2 +- padla-bom/pom.xml | 8 ++++---- padla-parent/pom.xml | 2 +- pom.xml | 2 +- reflector/pom.xml | 2 +- ultimate-messenger/pom.xml | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 2ee59481..a751d0ae 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,17 +2,18 @@ ## Supported Versions -| Version | Supported | -|--------------| ------------------ | -| [1.0.0-rc.9] | :heavy_check_mark: | -| < 1.0.0-rc.9 | :x: | +| Version | Supported | +|---------------| ------------------ | +| [1.0.0-rc.10] | :heavy_check_mark: | +| < 1.0.0-rc.10 | :x: | ## Reporting a Vulnerability -In order to report a vulnerability simply create an [issues](https://github.com/JarvisCraft/padla/issues) for it. +In order to report a vulnerability simply create +an [issues](https://github.com/JarvisCraft/padla/issues) for it. These are checked regularly and are the primary support channel. -[1.0.0-rc.8]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.8 +[1.0.0-rc.10]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.10 diff --git a/java-commons/pom.xml b/java-commons/pom.xml index 4b915a9a..2384fa1d 100644 --- a/java-commons/pom.xml +++ b/java-commons/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.10 ../padla-parent java-commons diff --git a/padla-bom/pom.xml b/padla-bom/pom.xml index f9c59a21..ed57e89b 100644 --- a/padla-bom/pom.xml +++ b/padla-bom/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.10 padla-bom pom @@ -20,17 +20,17 @@ ru.progrm-jarvis java-commons - 1.0.0-SNAPSHOT + 1.0.0-rc.10 ru.progrm-jarvis reflector - 1.0.0-SNAPSHOT + 1.0.0-rc.10 ru.progrm-jarvis ultimate-messenger - 1.0.0-SNAPSHOT + 1.0.0-rc.10 diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml index e8190b83..b008ced0 100644 --- a/padla-parent/pom.xml +++ b/padla-parent/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.10 padla-parent pom diff --git a/pom.xml b/pom.xml index 553e74a3..ddb96cf6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.10 padla-bom padla-parent diff --git a/reflector/pom.xml b/reflector/pom.xml index e55f0bea..de9c8d48 100644 --- a/reflector/pom.xml +++ b/reflector/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.10 ../padla-parent reflector diff --git a/ultimate-messenger/pom.xml b/ultimate-messenger/pom.xml index 87c8fb70..bf9b4405 100644 --- a/ultimate-messenger/pom.xml +++ b/ultimate-messenger/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.10 ../padla-parent ultimate-messenger