From e0f0c12e2fc6aacdae6ef728392caffb165c316e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 Sep 2024 01:28:38 +0000 Subject: [PATCH] Merge upstream --- .github/workflows/CI.yml | 47 ------ .github/workflows/dependencies.yml | 19 --- .github/workflows/examples-CI.yml | 33 ---- README.md | 261 ----------------------------- 4 files changed, 360 deletions(-) delete mode 100644 .github/workflows/CI.yml delete mode 100644 .github/workflows/dependencies.yml delete mode 100644 .github/workflows/examples-CI.yml delete mode 100644 README.md diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml deleted file mode 100644 index 1cefd02a2..000000000 --- a/.github/workflows/CI.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: CI - -on: - push: - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - name: Java ${{ matrix.java }} - strategy: - # don't cancel remaining matrix steps on failure - fail-fast: false - matrix: - java: [11, 17, 21] - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - - name: Build - run: | - chmod +x gradlew - ./gradlew assemble --no-daemon - - - name: Test - env: - GH_ACTIONS: true - run: ./gradlew check --no-daemon - - - name: Build coverage report - run: ./gradlew jacocoTestReport --no-daemon - - - uses: codecov/codecov-action@v4 - with: - files: build/reports/jacoco/test/jacocoTestReport.xml - flags: LINUX - fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml deleted file mode 100644 index 7bd6df464..000000000 --- a/.github/workflows/dependencies.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Dependencies -on: - push: - branches: - - master - -jobs: - build: - name: Dependencies - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - - - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@v3 \ No newline at end of file diff --git a/.github/workflows/examples-CI.yml b/.github/workflows/examples-CI.yml deleted file mode 100644 index e7744f8d0..000000000 --- a/.github/workflows/examples-CI.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Examples CI - -on: - push: - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - defaults: - run: - working-directory: examples - name: Java ${{ matrix.java }} - strategy: - matrix: - java: [11, 17] - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - - name: Build and Check - run: | - chmod +x gradlew - ./gradlew build --no-daemon diff --git a/README.md b/README.md deleted file mode 100644 index d481b7d72..000000000 --- a/README.md +++ /dev/null @@ -1,261 +0,0 @@ -# Dropwizard guice integration -[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://www.opensource.org/licenses/MIT) -[![CI](https://github.com/xvik/dropwizard-guicey/actions/workflows/CI.yml/badge.svg)](https://github.com/xvik/dropwizard-guicey/actions/workflows/CI.yml) -[![Appveyor build status](https://ci.appveyor.com/api/projects/status/github/xvik/dropwizard-guicey?svg=true&branch=master)](https://ci.appveyor.com/project/xvik/dropwizard-guicey/branch/master) -[![codecov](https://codecov.io/gh/xvik/dropwizard-guicey/branch/master/graph/badge.svg)](https://codecov.io/gh/xvik/dropwizard-guicey) - -**DOCUMENTATION**: http://xvik.github.io/dropwizard-guicey/ - -* [Examples](https://github.com/xvik/dropwizard-guicey/examples) -* [Extensions and integrations](https://github.com/xvik/dropwizard-guicey/) - -Support: [discussions](https://github.com/xvik/dropwizard-guicey/discussions) | [gitter chat](https://gitter.im/xvik/dropwizard-guicey) - -### About - -[Dropwizard](http://dropwizard.io/) 4.0.8 [guice](https://github.com/google/guice) 7.0.0 integration. - -Features: - -* Auto configuration from classpath scan and guice bindings. -* Yaml config values bindings by path or unique sub objects. -* Advanced Web support -* Dropwizard style console reporting: detected (and installed) extensions are printed to console to remove uncertainty -* Test support: custom junit and spock extensions -* Advanced test abilities to disable or override application logic -* Developer friendly: - - core integrations may be replaced (to better fit needs) - - rich api for developing custom integrations, and hooking into lifecycle) - - out of the box support for plug-n-play plugins (auto discoverable) - - diagnostic tools (reports), support for custom diagnostic tools - -### Sponsors - -    [![Channel Talk](dropwizard-guicey/src/doc/docs/img/sponsors/channel2.png)](https://channel.io "Channel Talk") - - -If guicey makes your life easier, you can [support its development](https://www.patreon.com/guicey). - -### Supported versions - -Due to 3 major changes in dropwizard recently, 3 guicey versions supported: - -Dropwizard | Guicey | Reason -----------|--------------------------------------------------------------|------- -2.1.x| [5.x](https://github.com/xvik/dropwizard-guicey/tree/dw-2.1) | Last java 8 compatible version (EOL [January 31 2024](https://github.com/dropwizard/dropwizard/discussions/7880)) -3.x | [6.x](https://github.com/xvik/dropwizard-guicey/tree/dw-3) | [Changed core dropwizard packages](https://github.com/dropwizard/dropwizard/blob/release/3.0.x/docs/source/manual/upgrade-notes/upgrade-notes-3_0_x.rst) - old 3rd paty bundles would be incompatible -4.x | 7.x | [Jakarta namespace migration](https://github.com/dropwizard/dropwizard/blob/release/4.0.x/docs/source/manual/upgrade-notes/upgrade-notes-4_0_x.rst) - 3rd party guice modules might be incompatible - -All branches use the same project structure: core guicey merged with extension modules. -It greatly simplifies releases and keeps actual examples in one branch. - -Upcoming guicey changes would be ported in all 3 branches. - -### Setup - -[![Maven Central](https://img.shields.io/maven-central/v/ru.vyarus/dropwizard-guicey.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/ru.vyarus/dropwizard-guicey) - -Maven: - -```xml - - ru.vyarus - dropwizard-guicey - 7.1.4 - -``` - -Gradle: - -```groovy -implementation 'ru.vyarus:dropwizard-guicey:7.1.4' -``` - -Dropwizard | Guicey -----------|--------- -4.0| [7.1.4](http://xvik.github.io/dropwizard-guicey/7.1.4) -3.0| [6.2.4](http://xvik.github.io/dropwizard-guicey/6.2.4) -2.1| [5.10.2](http://xvik.github.io/dropwizard-guicey/5.10.2) -2.0| [5.5.0](http://xvik.github.io/dropwizard-guicey/5.5.0) -1.3| [4.2.3](http://xvik.github.io/dropwizard-guicey/4.2.3) -1.1, 1.2 | [4.1.0](http://xvik.github.io/dropwizard-guicey/4.1.0) -1.0 | [4.0.1](http://xvik.github.io/dropwizard-guicey/4.0.1) -0.9 | [3.3.0](https://github.com/xvik/dropwizard-guicey/tree/dw-0.9) -0.8 | [3.1.0](https://github.com/xvik/dropwizard-guicey/tree/dw-0.8) -0.7 | [1.1.0](https://github.com/xvik/dropwizard-guicey/tree/dw-0.7) - -**GRADLE 6 users**: You might face `Could not resolve com.google.guava:guava:32.1.2-jre.` -problem. This caused by guava packaging [issue](https://github.com/google/guava/issues/6612) (affected many people). -Either upgrade to gradle 7-8 or [apply workaround](https://github.com/google/guava/issues/6612#issuecomment-1614992368) - -#### BOM - -Use [BOM](http://xvik.github.io/dropwizard-guicey/latest/extras/bom/) for guice, dropwizard and guicey modules dependency management. -BOM usage is highly recommended as it allows you to correctly update dropwizard dependencies. - -Gradle: - -```groovy -dependencies { - implementation platform('ru.vyarus.guicey:guicey-bom:7.1.4') - // uncomment to override dropwizard and its dependencies versions - //implementation platform('io.dropwizard:dropwizard-dependencies:4.0.8') - - // no need to specify versions - implementation 'ru.vyarus:dropwizard-guicey' - implementation 'ru.vyarus.guicey:guicey-eventbus' - - implementation 'io.dropwizard:dropwizard-auth' - implementation 'com.google.inject:guice-assistedinject' - - testImplementation 'io.dropwizard:dropwizard-testing' -} -``` - -Maven: - -```xml - - - - ru.vyarus.guicey - guicey-bom - 7.1.4 - pom - import - - - - - - - - ru.vyarus - dropwizard-guicey - - -``` - -BOM includes: - -BOM | Artifact ---------------|------------------------- -Guicey modules | `ru.vyarus.guicey:guicey-[module]` -Dropwizard BOM | `io.dropwizard:dropwizard-bom` -Guice BOM | `com.google.inject:guice-bom` -HK2 bridge | `org.glassfish.hk2:guice-bridge` -Spock-junit5 | `ru.vyarus:spock-junit5` - - -### Snapshots - -
- Snapshots may be used through JitPack - -Add [JitPack](https://jitpack.io/#ru.vyarus/dropwizard-guicey) repository: - -```groovy -repositories { maven { url 'https://jitpack.io' } } -``` - -For spring dependencies plugin (when guicey pom used as BOM): - -```groovy -dependencyManagement { - resolutionStrategy { - cacheChangingModulesFor 0, 'seconds' - } - imports { - mavenBom "ru.vyarus:dropwizard-guicey:master-SNAPSHOT" - } -} -``` - -For direct guicey dependency: - -```groovy -configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' -} - -dependencies { - implementation 'ru.vyarus:dropwizard-guicey:master-SNAPSHOT' -} -``` - -Note that in both cases `resolutionStrategy` setting required for correct updating snapshot with recent commits -(without it you will not always have up-to-date snapshot) - -OR you can depend on exact commit: - -* Go to [JitPack project page](https://jitpack.io/#ru.vyarus/dropwizard-guicey) -* Select `Commits` section and click `Get it` on commit you want to use and - use commit hash as version: `ru.vyarus:dropwizard-guicey:56537f7d23` - - -Maven: - -```xml - - - jitpack.io - https://jitpack.io - - - - - - - ru.vyarus - dropwizard-guicey - master-SNAPSHOT - pom - import - - - - - - - ru.vyarus - dropwizard-guicey - - -``` - -Or simply change version if used as direct dependency (repository must be also added): - -```xml - - ru.vyarus - dropwizard-guicey - master-SNAPSHOT - -``` - -
- -### Usage - -Read [documentation](http://xvik.github.io/dropwizard-guicey/) - -### Might also like - -* [yaml-updater](https://github.com/xvik/yaml-updater) - yaml configuration update tool, preserving comments and whitespaces (has dropwizard module) -* [generics-resolver](https://github.com/xvik/generics-resolver) - runtime generics resolution -* [guice-validator](https://github.com/xvik/guice-validator) - hibernate validator integration for guice -(objects validation, method arguments and return type runtime validation) -* [guice-ext-annotations](https://github.com/xvik/guice-ext-annotations) - @Log, @PostConstruct, @PreDestroy and -utilities for adding new annotations support -* [guice-persist-orient](https://github.com/xvik/guice-persist-orient) - guice integration for orientdb -* [dropwizard-orient-server](https://github.com/xvik/dropwizard-orient-server) - embedded orientdb server for dropwizard - ---- -[![java lib generator](http://img.shields.io/badge/Powered%20by-%20Java%20lib%20generator-green.svg?style=flat-square)](https://github.com/xvik/generator-lib-java)