Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Collision logging, Transformers for JSON and Standard Files #773

Closed
wants to merge 22 commits into from
Closed

Collision logging, Transformers for JSON and Standard Files #773

wants to merge 22 commits into from

Commits on Mar 16, 2015

  1. Displaying warn level messages when adding a file attempts to overw… 

    …rite an existing resource
    @chapmajs
    chapmajs committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    0bc643f View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Adding tests, not filtering META-INF/ by default

    @chapmajs
    chapmajs committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    8dec628 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Updated depedencies without braking changes for vulnerabilities 

    Used "npm audit fix".
    Jan-Hendrik Diederich committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    394ebe2 View commit details
    Browse the repository at this point in the history

  2. Merged "Collision logging" into current HEAD

    Another User authored and Another User committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    e43da40 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Cleaned up "Collision logging" and added StandardFilesMergeTransforme… 

    …r to merge standard files
    Another User authored and Another User committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    524c19e View commit details
    Browse the repository at this point in the history

  2. Made StandardFilesMergeTransformer cacheable.

    Another User authored and Another User committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    77aeb95 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Merge branch 'master' into chapmajs-collision_logging

    Another User committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4131e18 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge remote-tracking branch 'origin/master'

    Jan-Hendrik Diederich committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    9450b60 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into chapmajs-collision_logging

    Jan-Hendrik Diederich committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    39ee49f View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Merge branch 'johnrengelman:master' into master

    Another User committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    dcc54a3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into chapmajs-collision_logging

    Jan-Hendrik Diederich committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    ad60c5c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Merged latest changes for Gradle 8.0 into master

    Jan-Hendrik Diederich committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a215438 View commit details
    Browse the repository at this point in the history

  2. Displaying warn level messages when adding a file attempts to overw… 

    …rite an existing resource
    @chapmajs
    chapmajs authored and Jan-Hendrik Diederich committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    08cba3a View commit details
    Browse the repository at this point in the history

  3. Adding tests, not filtering META-INF/ by default

    @chapmajs
    chapmajs authored and Jan-Hendrik Diederich committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    1c893c8 View commit details
    Browse the repository at this point in the history

  4. Cleaned up "Collision logging" and added StandardFilesMergeTransforme… 

    …r to merge standard files
    Another User committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    972c1fe View commit details
    Browse the repository at this point in the history

  5. Made StandardFilesMergeTransformer cacheable.

    Another User committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    bc01434 View commit details
    Browse the repository at this point in the history

  6. Fixed merge problems

    Jan-Hendrik Diederich committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a9590c0 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Merge remote-tracking branch 'original_repo/master' 

    # Conflicts:
#	yarn.lock
    Jan Diederich committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    f041ec4 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Merged Gradle 8 ready version with collision logging

    Jan Diederich committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    782b769 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Lower the log-level for duplicated "META-INF/MANIFEST.MF" from warn t… 

    …o debug

So the user doesn't get flooded with superfluous logs
    Jan Diederich committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    1acac73 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'chapmajs-collision_logging_merge' into chapmajs-collisi… 

    …on_logging

# Conflicts:
#	.gitignore
#	src/docs/changes/README.md
#	src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy
#	src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.java
#	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy
#	yarn.lock
    Jan Diederich committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    c70c174 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Adding JsonTransformer and tests for it

    Jan Diederich committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    b7c7b33 View commit details
    Browse the repository at this point in the history