Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: googleapis/java-shared-config
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.0
Choose a base ref
...
head repository: googleapis/java-shared-config
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.9.1
Choose a head ref
  • 8 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 29, 2020

  1. Configuration menu
    Copy the full SHA
    8b98af5 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Configuration menu
    Copy the full SHA
    8fc9789 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b49d421 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a9c6eb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9ab06b2 View commit details
    Browse the repository at this point in the history
  5. fix: maven-dependency-plugin configuration breaking downstream config (

    …#174)
    
    When providing configuration to the maven-dependency-plugin,
    `ignoredUnusedDeclaredDependencies` is a `java.lang.String[]` but mavens xml
    handling allows multiple formats for providing a list of values (comma
    separated string, or sub elements each specifying a single value). It appears
    that when loading the config, the value of the configuration at a lower level
    is blindly pre-pended as a string rather than first parsing and merging the
    results. Below is the debug output of the resolved configuration using the
    existing config added in cd635ad, the output after this change and a diff of
    the two. Notice, in the left hand side of the diff the malformed xml.
    
    The change introduced in this commit switches from using the comma separated
    string representation, to using the sub element representation thereby allowing
    the config resolution to create a valid config.
    
    ###### Resolved config as of cd635ad
    ```
    [DEBUG] Goal:          org.apache.maven.plugins:maven-dependency-plugin:3.1.2:analyze (default-cli)
    [DEBUG] Style:         Regular
    [DEBUG] Configuration: <?xml version="1.0" encoding="UTF-8"?>
    <configuration>
      <analyzer default-value="default">${analyzer}</analyzer>
      <baseDir default-value="${basedir}"/>
      <failOnWarning default-value="false">${failOnWarning}</failOnWarning>
      <ignoreNonCompile default-value="false">${ignoreNonCompile}</ignoreNonCompile>
      <ignoredUnusedDeclaredDependencies>
        <ignoredUnusedDeclaredDependency>com.google.http-client:google-http-client-jackson2</ignoredUnusedDeclaredDependency>
        <ignoredUnusedDeclaredDependency>com.google.oauth-client:google-oauth-client</ignoredUnusedDeclaredDependency>
        <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependencies>
      <outputDirectory default-value="${project.build.directory}"/>
      <outputXML default-value="false">${outputXML}</outputXML>
      <project default-value="${project}"/>
      <scriptableFlag default-value="$$$%%%">${scriptableFlag}</scriptableFlag>
      <scriptableOutput default-value="false">${scriptableOutput}</scriptableOutput>
      <skip default-value="false">${mdep.analyze.skip}</skip>
      <verbose default-value="false">${verbose}</verbose>
    </configuration>
    ```
    
    ###### Resolved config now
    ```
    [DEBUG] Goal:          org.apache.maven.plugins:maven-dependency-plugin:3.1.2:analyze (default-cli)
    [DEBUG] Style:         Regular
    [DEBUG] Configuration: <?xml version="1.0" encoding="UTF-8"?>
    <configuration>
      <analyzer default-value="default">${analyzer}</analyzer>
      <baseDir default-value="${basedir}"/>
      <failOnWarning default-value="false">${failOnWarning}</failOnWarning>
      <ignoreNonCompile default-value="false">${ignoreNonCompile}</ignoreNonCompile>
      <ignoredUnusedDeclaredDependencies>
        <ignoredUnusedDeclaredDependency>com.google.http-client:google-http-client-jackson2</ignoredUnusedDeclaredDependency>
        <ignoredUnusedDeclaredDependency>com.google.oauth-client:google-oauth-client</ignoredUnusedDeclaredDependency>
        <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
      </ignoredUnusedDeclaredDependencies>
      <outputDirectory default-value="${project.build.directory}"/>
      <outputXML default-value="false">${outputXML}</outputXML>
      <project default-value="${project}"/>
      <scriptableFlag default-value="$$$%%%">${scriptableFlag}</scriptableFlag>
      <scriptableOutput default-value="false">${scriptableOutput}</scriptableOutput>
      <skip default-value="false">${mdep.analyze.skip}</skip>
      <verbose default-value="false">${verbose}</verbose>
    </configuration>
    
    ```
    
    ##### Diff between resolved configs
    ```diff
    12c12,13
    <     <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependencies>
    ---
    >     <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
    >   </ignoredUnusedDeclaredDependencies>
    ```
    BenWhitehead authored Jul 1, 2020
    Configuration menu
    Copy the full SHA
    507217f View commit details
    Browse the repository at this point in the history
  6. chore: release 0.9.1-SNAPSHOT (#177)

    🤖 I have created a release \*beep\* \*boop\* 
    ---
    ### Updating meta-information for bleeding-edge SNAPSHOT release.
    ---
    
    
    This PR was generated with [Release Please](https://github.com/googleapis/release-please).
    release-please[bot] authored Jul 1, 2020
    Configuration menu
    Copy the full SHA
    63ed1a3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    60c03c8 View commit details
    Browse the repository at this point in the history
Loading