Replace JsonPathEquals/YamlPathEquals with JsonValueEquals/YamlValueE…

…quals (#50) * JSON Pointer progress replacement for JSON Path * Rename pointer to value in equals enforcers * Remove JsonPath/YamlPath and replace with JsonPointer/YamlPointer (removes json-path dependency) * Add edge case where number is key to map * Fix tag name for homebrew formula update
Optum · Feb 27, 2021 · c73da31 · c73da31
1 parent 38030ac
commit c73da31
Show file tree

Hide file tree

Showing 17 changed files with 819 additions and 955 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -267,10 +267,11 @@ jobs:
           asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-darwin-x86_64.tar.gz
           asset_content_type: application/octet-stream
       - name: Update Optum Homebrew Tap Formula
-        uses: mislav/bump-homebrew-formula-action@v1.9
+        uses: mislav/bump-homebrew-formula-action@v1.10
         continue-on-error: true
         with:
           formula-name: sourcehawk
+          tag-name: ${{ needs.build.outputs.RELEASE_VERSION }}
           homebrew-tap: optum/homebrew-tap
           base-branch: main
           download-url: ${{ steps.upload_homebrew_tap_formula_archive.outputs.browser_download_url }}

diff --git a/attribution.txt b/attribution.txt
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -367,9 +367,6 @@
                                     <includes combine.children="append">
                                         <include>com.fasterxml.jackson.core:*:*:*:*</include>
                                         <include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:*:*</include>
-                                        <include>com.jayway.jsonpath:json-path:*:*:*</include>
-                                        <include>net.minidev:accessors-smart:*:*:*</include>
-                                        <include>net.minidev:json-smart:*:*:*</include>
                                         <include>org.apache.maven:maven-model:*:*:*</include>
                                         <include>org.codehaus.plexus:plexus-utils:*:*:*</include>
                                         <include>org.ow2.asm:asm:*:*:*</include>

diff --git a/core/pom.xml b/core/pom.xml
@@ -50,6 +50,11 @@
             <artifactId>mockserver-client-java</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/enforcer/file/common/pom.xml b/enforcer/file/common/pom.xml
@@ -44,11 +44,6 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/...cer/file/common/src/main/java/com/optum/sourcehawk/enforcer/file/json/JsonPathEquals.java b/...cer/file/common/src/main/java/com/optum/sourcehawk/enforcer/file/json/JsonPathEquals.java