diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index a0d7f178..43b52907 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -52,6 +52,7 @@ + @@ -68,6 +69,11 @@ + + + + + @@ -93,7 +99,6 @@ - @@ -122,7 +127,13 @@ + + + + + + diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml index 7a03f17c..88a7b5ae 100644 --- a/.config/pmd/ruleset.xml +++ b/.config/pmd/ruleset.xml @@ -10,16 +10,38 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -76,9 +98,6 @@ - - - @@ -114,17 +133,33 @@ + + + + + + + + + + + + + + + + - + diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 648aa49c..92723455 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,6 +1,7 @@ name: 🐞 Bug description: Create a bug report for something that is broken labels: [bug] +type: bug body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 40eac88d..5d5d1469 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -1,6 +1,7 @@ name: ✨ Feature/Enhancement description: Suggest a new feature or enhancement labels: [enhancement] +type: feature body: - type: markdown attributes: diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 8f98f1ad..16a3f376 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -19,7 +19,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead @@ -38,7 +38,7 @@ jobs: - name: Create Issue From File if: env.lychee_exit_code != 0 - uses: peter-evans/create-issue-from-file@v5 + uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5 with: issue-number: ${{ steps.find-issue.outputs.number }} title: Link Checker Report diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 08181168..01edc3aa 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -127,7 +127,4 @@ jobs: name: pmd-report if-no-files-found: ignore path: | - target/site/*.html - target/site/css/** - target/site/images/logos/maven-feather.png - target/site/images/external.png + target/reports/** diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 236c0f59..2cb33930 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: ./mvnw -B clean package + run: ./mvnw -B clean package -T2C - name: Check for uncommited changes run: | @@ -64,7 +64,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" @@ -89,7 +89,7 @@ jobs: - name: Create Release id: create_release - uses: shogo82148/actions-create-release@v1 + uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1 with: tag_name: v${{ steps.version.outputs.release }} release_name: v${{ steps.version.outputs.release }} @@ -121,22 +121,22 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK Apache Maven Central + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to Apache Maven Central - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} @@ -165,10 +165,11 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Deploy to Github pages - uses: peaceiris/actions-gh-pages@v4 + uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site + force_orphan: true after-release: runs-on: ubuntu-latest @@ -187,7 +188,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index c9d7ec78..dc672877 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,6 +20,6 @@ jobs: with: sparse-checkout: .github/labels.yml - - uses: EndBug/label-sync@v2 + - uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2 with: config-file: .github/labels.yml diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 03f5339e..8a858912 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,21 +13,21 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 6f9497eb..65f56b0d 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -202,7 +202,7 @@ jobs: GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} run: | not_failed_conclusion="skipped|neutral|success" - not_relevant_app_slug="dependabot|github-pages|sonarcloud" + not_relevant_app_slug="dependabot|github-pages|sonarqubecloud" echo "Waiting for checks to start..." sleep 40s @@ -212,7 +212,7 @@ jobs: echo "Checking if update-branch-merged exists" git fetch - if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then + if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then echo "Branch still exists; Continuing..." else echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing" diff --git a/.gitignore b/.gitignore index 116a656e..5c850540 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ hs_err_pid* .idea/* !.idea/saveactions_settings.xml !.idea/checkstyle-idea.xml +!.idea/externalDependencies.xml !.idea/inspectionProfiles/ .idea/inspectionProfiles/* diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 00000000..78be5b8e --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 091f9dbd..29b95cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ -## 3.0.1 +# 3.0.2 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) +* Updated dependencies + +# 3.0.1 * Fix for ExplicitMigrater without any scripts -## 3.0.0 +# 3.0.0 * Added support for EclipseStore v2 * Having an empty version for the first migration-script is now allowed -## 2.0.0 +# 2.0.0 _Major refactoring_ * Consolidated all previous modules into a single one * Dropped support for MicroStream as EclipseStore is it's successor @@ -15,32 +19,32 @@ _Major refactoring_ * Slimed down dependencies * Minimal required Java version: 17 -## 1.0.0 +# 1.0.0 * Added support for EclipseStore v1 * Updated plenty of libraries -## 0.0.9 +# 0.0.9 * Added support for MicroStream v8 -## 0.0.8 +# 0.0.8 * Access to the native embedded manager is now possible in the scripts (see ``VersionAgnosticMigrationEmbeddedStorageManager#getNativeStorageManager``) -## 0.0.7 +# 0.0.7 * A lot of refactoring of the module structure * A migration history is now available and automatically stored -## 0.0.6 +# 0.0.6 * Tried a new release-action...again. -## 0.0.5 +# 0.0.5 * Tried a new release-action. -## 0.0.4 +# 0.0.4 * Fixed setup. 0.0.3 was not working with the release setup. -## 0.0.3 +# 0.0.3 * Restructured the complete maven modules. Multiple MicroStream-Versions are now supported. * Added plenty of documentation -## 0.0.2 +# 0.0.2 * Updated MicroStream from v4 to v5. diff --git a/micro-migration-demo/pom.xml b/micro-migration-demo/pom.xml index 949fff66..7131160f 100644 --- a/micro-migration-demo/pom.xml +++ b/micro-migration-demo/pom.xml @@ -37,7 +37,7 @@ org.slf4j slf4j-simple - 2.0.16 + 2.0.17 @@ -48,7 +48,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 ${maven.compiler.release} diff --git a/micro-migration/pom.xml b/micro-migration/pom.xml index 167f7857..de34fe6f 100644 --- a/micro-migration/pom.xml +++ b/micro-migration/pom.xml @@ -35,7 +35,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - org.eclipse.store @@ -99,14 +64,14 @@ org.junit.jupiter junit-jupiter - 5.11.4 + 5.12.2 test org.slf4j slf4j-simple - 2.0.16 + 2.0.17 test @@ -122,7 +87,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.8.0 + 3.9.0 @@ -130,7 +95,7 @@ com.mycila license-maven-plugin - 4.6 + 5.0.0 ${project.organization.url} @@ -159,7 +124,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 ${maven.compiler.release} @@ -203,19 +168,19 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 - ossrh + publish-sonatype-central-portal org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.7.0 ossrh @@ -253,16 +218,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true @@ -280,7 +242,7 @@ com.puppycrawl.tools checkstyle - 10.21.1 + 10.23.1 @@ -317,12 +279,12 @@ net.sourceforge.pmd pmd-core - 7.9.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.9.0 + 7.13.0 diff --git a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptAfterScriptTest.java b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptAfterScriptTest.java index 0f18f5cd..5b720dd6 100644 --- a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptAfterScriptTest.java +++ b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptAfterScriptTest.java @@ -62,7 +62,7 @@ void checkMigrationWithThreeDifferentMigraterMigrationEmbeddedStorageManager(@Te final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(1) + context -> context.getStorageManager().setRoot(1) ); final ExplicitMigrater secondMigrater = new ExplicitMigrater(firstScript); try(final MigrationEmbeddedStorageManager migrationStorageManager = MigrationEmbeddedStorage.start( @@ -77,7 +77,7 @@ void checkMigrationWithThreeDifferentMigraterMigrationEmbeddedStorageManager(@Te final VersionAgnosticMigrationScript secondScript = new SimpleTypedMigrationScript<>( new MigrationVersion(2), - (context) -> context.getStorageManager().setRoot(2) + context -> context.getStorageManager().setRoot(2) ); final ExplicitMigrater thirdMigrater = new ExplicitMigrater(firstScript, secondScript); try(final MigrationEmbeddedStorageManager migrationStorageManager = MigrationEmbeddedStorage.start( @@ -97,7 +97,7 @@ void checkMigrationAndUseStorer(@TempDir final Path storageFolder) final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> + context -> { context.getStorageManager().setRoot(firstList); firstList.add("1"); @@ -122,7 +122,7 @@ void checkMigrationWithScriptExecutionNotification(@TempDir final Path storageFo final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(1) + context -> context.getStorageManager().setRoot(1) ); final ExplicitMigrater migrater = new ExplicitMigrater(firstScript); final AtomicBoolean notificationReceived = new AtomicBoolean(false); @@ -158,7 +158,7 @@ void checkMigrationWithThreeDifferentMigraterStandaloneMicroMigrationManager(@Te final VersionAgnosticMigrationScript, MigrationEmbeddedStorageManager> firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getMigratingObject().setObject(1) + context -> context.getMigratingObject().setObject(1) ); try(final EmbeddedStorageManager storageManager = this.startEmbeddedStorageManagerWithPath(storageFolder)) { @@ -178,7 +178,7 @@ void checkMigrationWithThreeDifferentMigraterStandaloneMicroMigrationManager(@Te final VersionAgnosticMigrationScript, MigrationEmbeddedStorageManager> secondScript = new SimpleTypedMigrationScript<>( new MigrationVersion(2), - (context) -> context.getMigratingObject().setObject(2) + context -> context.getMigratingObject().setObject(2) ); try(final EmbeddedStorageManager storageManager = this.startEmbeddedStorageManagerWithPath(storageFolder)) { diff --git a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptWithNullSourceVersionTest.java b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptWithNullSourceVersionTest.java index 7bab91c8..4f5a84d8 100644 --- a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptWithNullSourceVersionTest.java +++ b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MigrationScriptWithNullSourceVersionTest.java @@ -70,7 +70,7 @@ void updateFromEmptyVersion(@TempDir final Path storageFolder) final VersionAgnosticMigrationScript, MigrationEmbeddedStorageManager> firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> { + context -> { } ); @@ -82,7 +82,6 @@ void updateFromEmptyVersion(@TempDir final Path storageFolder) storageManager ) .migrate(storageManager.root()); - @SuppressWarnings("unchecked") final EmptyVersionedRoot currentRoot = (EmptyVersionedRoot)storageManager.root(); assertEquals(new MigrationVersion(1), currentRoot.getVersion()); } @@ -108,7 +107,6 @@ void updateWithNoScripts(@TempDir final Path storageFolder) storageManager ) .migrate(storageManager.root()); - @SuppressWarnings("unchecked") final EmptyVersionedRoot currentRoot = (EmptyVersionedRoot)storageManager.root(); assertNull(currentRoot.getVersion()); } diff --git a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MultipleScriptsTest.java b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MultipleScriptsTest.java index 458e1fd1..768ddeee 100644 --- a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MultipleScriptsTest.java +++ b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/MultipleScriptsTest.java @@ -40,12 +40,12 @@ void checkMigrationWithTwoScriptsAtOnceMigrationEmbeddedStorageManager(@TempDir final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(1) + context -> context.getStorageManager().setRoot(1) ); final VersionAgnosticMigrationScript secondScript = new SimpleTypedMigrationScript<>( new MigrationVersion(2), - (context) -> context.getStorageManager().setRoot(2) + context -> context.getStorageManager().setRoot(2) ); final ExplicitMigrater migrater = new ExplicitMigrater(firstScript, secondScript); try(final MigrationEmbeddedStorageManager migrationStorageManager = MigrationEmbeddedStorage.start( @@ -63,12 +63,12 @@ void checkMigrationWithTwoScriptsWithSameVersion() final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(1) + context -> context.getStorageManager().setRoot(1) ); final VersionAgnosticMigrationScript secondScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(2) + context -> context.getStorageManager().setRoot(2) ); Assertions.assertThrows(VersionAlreadyRegisteredException.class, () -> new ExplicitMigrater(firstScript, secondScript) @@ -81,17 +81,17 @@ void checkMigrationWithThreeScriptsWithSameVersion() final VersionAgnosticMigrationScript firstScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(1) + context -> context.getStorageManager().setRoot(1) ); final VersionAgnosticMigrationScript secondScript = new SimpleTypedMigrationScript<>( new MigrationVersion(2), - (context) -> context.getStorageManager().setRoot(2) + context -> context.getStorageManager().setRoot(2) ); final VersionAgnosticMigrationScript thirdScript = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(3) + context -> context.getStorageManager().setRoot(3) ); Assertions.assertThrows(VersionAlreadyRegisteredException.class, () -> new ExplicitMigrater(firstScript, secondScript, thirdScript) diff --git a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/StoreStuffInMigrationStorageManagerTest.java b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/StoreStuffInMigrationStorageManagerTest.java index 19fa22cc..ce71c6b5 100644 --- a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/StoreStuffInMigrationStorageManagerTest.java +++ b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/integration/StoreStuffInMigrationStorageManagerTest.java @@ -50,7 +50,7 @@ void checkStoringSomethingAfterUpdating(@TempDir final Path storageFolder) final VersionAgnosticMigrationScript script = new SimpleTypedMigrationScript<>( new MigrationVersion(1), - (context) -> { + context -> { } ); final ExplicitMigrater migrater = new ExplicitMigrater(script); @@ -61,7 +61,7 @@ void checkStoringSomethingAfterUpdating(@TempDir final Path storageFolder) { migrationStorageManager.setRoot(new RootClass()); migrationStorageManager.storeRoot(); - final RootClass storedRoot = ((RootClass)migrationStorageManager.root()); + final RootClass storedRoot = (RootClass)migrationStorageManager.root(); assertEquals(0, storedRoot.child.i); ((RootClass)migrationStorageManager.root()).child.i = 1; migrationStorageManager.store(storedRoot.child); @@ -72,7 +72,7 @@ void checkStoringSomethingAfterUpdating(@TempDir final Path storageFolder) storageFolder, migrater)) { - final RootClass storedRoot = ((RootClass)migrationStorageManager.root()); + final RootClass storedRoot = (RootClass)migrationStorageManager.root(); assertNotNull(storedRoot); assertEquals(1, storedRoot.child.i); } diff --git a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/migrater/ExplicitMigraterTest.java b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/migrater/ExplicitMigraterTest.java index 3db68306..823612a8 100644 --- a/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/migrater/ExplicitMigraterTest.java +++ b/micro-migration/src/test/java/software/xdev/micromigration/eclipsestore/migrater/ExplicitMigraterTest.java @@ -76,7 +76,7 @@ void checkWrongTypedVersionedScript(@TempDir final Path storageFolder) final ExplicitMigrater migrater = new ExplicitMigrater( new SimpleTypedMigrationScript( new MigrationVersion(1), - (context) -> context.getStorageManager().setRoot(context.getMigratingObject() + 1) + context -> context.getStorageManager().setRoot(context.getMigratingObject() + 1) ) ); Assertions.assertThrows( diff --git a/pom.xml b/pom.xml index ecffef4d..e2c02791 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.1 + 10.23.1 @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.9.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.9.0 + 7.13.0