From 072cb4ec9c83b389f1ec3cf11e485e0b7568184f Mon Sep 17 00:00:00 2001 From: Brian Wyka <46069296+brianwyka@users.noreply.github.com> Date: Sun, 28 Feb 2021 18:27:59 -0800 Subject: [PATCH] Dependency Cleanup (#52) * Dependency cleanup * Fix sourcehawk configuraiton updates in tests --- attribution.txt | 22 ------------------- cli/pom.xml | 1 - .../sourcehawk/cli/FixCommandSpec.groovy | 1 - .../flattened/sourcehawk-flattened-base.yml | 2 +- .../sourcehawk-flattened-override.yml | 4 ++-- .../test/resources/repo-updates/lombok.config | 5 +---- .../resources/repo-updates/sourcehawk.yml | 3 --- cli/src/test/resources/repo/lombok.config | 5 +---- cli/src/test/resources/repo/sourcehawk.yml | 3 --- .../test/resources/sourcehawk-override.yml | 5 +++-- enforcer/file/pom.xml | 1 - exec/pom.xml | 1 - .../resources/sourcehawk-flattened-base.yml | 2 +- pom.xml | 1 - 14 files changed, 9 insertions(+), 47 deletions(-) diff --git a/attribution.txt b/attribution.txt index 204244e..e9b35ea 100644 --- a/attribution.txt +++ b/attribution.txt @@ -837,28 +837,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------------------------------------------------------- - -Package: org.ow2.asm:asm:5.0.4 - -License: BSD-3-Clause - -Copyrights: - - -License Text: -Copyright (c) . All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------------------------------------------------------------------------------------------------------------------------------- Package: org.opentest4j:opentest4j:1.2.0 diff --git a/cli/pom.xml b/cli/pom.xml index 6cb724e..441e361 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -369,7 +369,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:*:* org.apache.maven:maven-model:*:*:* org.codehaus.plexus:plexus-utils:*:*:* - org.ow2.asm:asm:*:*:* org.slf4j:slf4j-api:*:*:* org.slf4j:slf4j-nop:*:*:* org.yaml:snakeyaml:*:*:* diff --git a/cli/src/test/groovy/com/optum/sourcehawk/cli/FixCommandSpec.groovy b/cli/src/test/groovy/com/optum/sourcehawk/cli/FixCommandSpec.groovy index 5b23b02..8b10bca 100644 --- a/cli/src/test/groovy/com/optum/sourcehawk/cli/FixCommandSpec.groovy +++ b/cli/src/test/groovy/com/optum/sourcehawk/cli/FixCommandSpec.groovy @@ -93,7 +93,6 @@ class FixCommandSpec extends CliBaseSpecification { then: properties.getProperty("config.stopBubbling") == "true" properties.getProperty("lombok.addLombokGeneratedAnnotation") == "true" - properties.getProperty("lombok.anyConstructor.addConstructorProperties") == "true" } def "main: no files updated"() { diff --git a/cli/src/test/resources/flattened/sourcehawk-flattened-base.yml b/cli/src/test/resources/flattened/sourcehawk-flattened-base.yml index 4e24be0..b250224 100644 --- a/cli/src/test/resources/flattened/sourcehawk-flattened-base.yml +++ b/cli/src/test/resources/flattened/sourcehawk-flattened-base.yml @@ -23,7 +23,7 @@ file-protocols: property-name: "config.stopBubbling" expected-property-value: true - enforcer: ".common.StringPropertyEquals" - property-name: "lombok.anyConstructor.addConstructorProperties" + property-name: "lombok.addLombokGeneratedAnnotation" expected-property-value: true - name: "Notice" description: null diff --git a/cli/src/test/resources/flattened/sourcehawk-flattened-override.yml b/cli/src/test/resources/flattened/sourcehawk-flattened-override.yml index b69ae13..0f6a243 100644 --- a/cli/src/test/resources/flattened/sourcehawk-flattened-override.yml +++ b/cli/src/test/resources/flattened/sourcehawk-flattened-override.yml @@ -35,8 +35,8 @@ file-protocols: property-name: "config.stopBubbling" expected-property-value: false - enforcer: ".common.StringPropertyEquals" - property-name: "lombok.anyConstructor.addConstructorProperties" - expected-property-value: false + property-name: "lombok.addLombokGeneratedAnnotation" + expected-property-value: true - name: "Notice" description: null repository-path: "NOTICE.txt" diff --git a/cli/src/test/resources/repo-updates/lombok.config b/cli/src/test/resources/repo-updates/lombok.config index 09d354c..a1c2800 100644 --- a/cli/src/test/resources/repo-updates/lombok.config +++ b/cli/src/test/resources/repo-updates/lombok.config @@ -3,7 +3,4 @@ config.stopBubbling = false # This allows us to notify Jacoco static code analysis to skip scanning generated code -lombok.addLombokGeneratedAnnotation = false - -# Constructor properties are useful for deserialization of objects with Jackson -lombok.anyConstructor.addConstructorProperties = false \ No newline at end of file +lombok.addLombokGeneratedAnnotation = false \ No newline at end of file diff --git a/cli/src/test/resources/repo-updates/sourcehawk.yml b/cli/src/test/resources/repo-updates/sourcehawk.yml index b95d815..0225f82 100644 --- a/cli/src/test/resources/repo-updates/sourcehawk.yml +++ b/cli/src/test/resources/repo-updates/sourcehawk.yml @@ -14,7 +14,4 @@ file-protocols: expected-property-value: true - enforcer: .common.StringPropertyEquals property-name: lombok.addLombokGeneratedAnnotation - expected-property-value: true - - enforcer: .common.StringPropertyEquals - property-name: lombok.anyConstructor.addConstructorProperties expected-property-value: true \ No newline at end of file diff --git a/cli/src/test/resources/repo/lombok.config b/cli/src/test/resources/repo/lombok.config index 2133b75..9564851 100644 --- a/cli/src/test/resources/repo/lombok.config +++ b/cli/src/test/resources/repo/lombok.config @@ -3,7 +3,4 @@ config.stopBubbling = true # This allows us to notify Jacoco static code analysis to skip scanning generated code -lombok.addLombokGeneratedAnnotation = true - -# Constructor properties are useful for deserialization of objects with Jackson -lombok.anyConstructor.addConstructorProperties = true \ No newline at end of file +lombok.addLombokGeneratedAnnotation = true \ No newline at end of file diff --git a/cli/src/test/resources/repo/sourcehawk.yml b/cli/src/test/resources/repo/sourcehawk.yml index b95d815..0225f82 100644 --- a/cli/src/test/resources/repo/sourcehawk.yml +++ b/cli/src/test/resources/repo/sourcehawk.yml @@ -14,7 +14,4 @@ file-protocols: expected-property-value: true - enforcer: .common.StringPropertyEquals property-name: lombok.addLombokGeneratedAnnotation - expected-property-value: true - - enforcer: .common.StringPropertyEquals - property-name: lombok.anyConstructor.addConstructorProperties expected-property-value: true \ No newline at end of file diff --git a/cli/src/test/resources/sourcehawk-override.yml b/cli/src/test/resources/sourcehawk-override.yml index 4aea920..e3bd790 100644 --- a/cli/src/test/resources/sourcehawk-override.yml +++ b/cli/src/test/resources/sourcehawk-override.yml @@ -34,8 +34,9 @@ file-protocols: property-name: config.stopBubbling expected-property-value: false - enforcer: .common.StringPropertyEquals - property-name: lombok.anyConstructor.addConstructorProperties - expected-property-value: false + property-name: lombok.addLombokGeneratedAnnotation + expected-property-value: true + # Composable recursive source hawk configs (Must be public repo) config-locations: diff --git a/enforcer/file/pom.xml b/enforcer/file/pom.xml index 3b502fc..5ef024b 100644 --- a/enforcer/file/pom.xml +++ b/enforcer/file/pom.xml @@ -41,7 +41,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:*:*:* org.apache.maven:maven-model:*:*:* org.codehaus.plexus:plexus-utils:*:*:* - org.ow2.asm:asm:*:*:* org.slf4j:slf4j-api:*:*:* org.yaml:snakeyaml:*:*:* diff --git a/exec/pom.xml b/exec/pom.xml index f95eb41..a517011 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -95,7 +95,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:*:* org.apache.maven:maven-model:*:*:* org.codehaus.plexus:plexus-utils:*:*:* - org.ow2.asm:asm:*:*:* org.slf4j:slf4j-api:*:*:* org.slf4j:slf4j-nop:*:*:* org.yaml:snakeyaml:*:*:* diff --git a/exec/src/test/resources/sourcehawk-flattened-base.yml b/exec/src/test/resources/sourcehawk-flattened-base.yml index 4e24be0..b250224 100644 --- a/exec/src/test/resources/sourcehawk-flattened-base.yml +++ b/exec/src/test/resources/sourcehawk-flattened-base.yml @@ -23,7 +23,7 @@ file-protocols: property-name: "config.stopBubbling" expected-property-value: true - enforcer: ".common.StringPropertyEquals" - property-name: "lombok.anyConstructor.addConstructorProperties" + property-name: "lombok.addLombokGeneratedAnnotation" expected-property-value: true - name: "Notice" description: null diff --git a/pom.xml b/pom.xml index 871ef98..f552ae7 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,6 @@ com.fasterxml.jackson.core:*:*:*:* com.optum.sourcehawk:*:*:*:* - javax.activation:activation *:*:*:*:provided *:*:*:*:test