.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: gradle
+  directory: /
+  schedule:
+    interval: weekly
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: weekly

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build
+name: CI
 
 on:
   pull_request:
@@ -12,10 +12,25 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+
+    - uses: actions/checkout@v3
+
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'temurin'
         java-version: 8
-    - name: "Gradle Build"
-      run: ./gradlew clean build
+        cache: 'gradle'
+
+    - name: Gradle Build
+      run: ./gradlew build
+
+    - name: Run Demo
+      if: github.event_name == 'pull_request'
+      run: ./run.sh
+
+    - uses: actions/upload-artifact@v3
+      if: github.event_name == 'pull_request'
+      with:
+        name: custom-report.html
+        path: custom-report.html

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,27 @@
+name: "Validate Gradle Wrapper"
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/**'
+      - '.github/workflows/gradle-wrapper-validation.yml'
+  pull_request:
+    branches:
+    - master
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/**'
+      - '.github/workflows/gradle-wrapper-validation.yml'
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/release.yml

@@ -17,11 +17,19 @@ jobs:
         id: release
       - name: "Gradle Build"
         run: ./gradlew build -Pversion=${{ steps.release.outputs.version }}
-      - name: "Publish packages to GitHub"
+
+      - name: Prepare to publish
+        run: |
+          echo '${{secrets.GPG_KEY_CONTENTS}}' | base64 -d > ${{ github.workspace }}/publish_key.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" \
+          --output ${{ github.workspace }}/secret.gpg ${{ github.workspace }}/publish_key.gpg
+
+      - name: "Publish packages to Maven Central"
         env:
-          GITHUB_USER: ${{ secrets.GITHUB_USER }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publish -Pversion=${{ steps.release.outputs.version }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        run: ./gradlew --no-parallel publishAllPublicationsToSonatypeRepository -Pversion=${{ steps.release.outputs.version }} -Psigning.secretKeyRingFile=${{ github.workspace }}/secret.gpg -Psigning.keyId=${{secrets.SIGNING_KEYID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}}
+
       - name: "Publish Zip to GitHub"
         uses: actions/upload-release-asset@v1
         env:

.gitignore

@@ -11,3 +11,4 @@ build
 
 # Allure
 allure-results
+bin/

README.md

@@ -1,11 +1,15 @@
 [license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License 2.0"
 [release]: https://github.com/viclovsky/swagger-coverage/releases/latest "Latest release"
 [release-badge]: https://img.shields.io/github/release/viclovsky/swagger-coverage.svg?style=flat
+[maven]: https://repo.maven.apache.org/maven2/com/github/viclovsky/swagger-coverage-commandline/ "Maven Central"
+[maven-badge]: https://img.shields.io/maven-central/v/com.github.viclovsky/swagger-coverage-commandline.svg?style=flat
+
 [![Build Status](https://github.com/viclovsky/swagger-coverage/workflows/Build/badge.svg)](https://github.com/viclovsky/swagger-coverage/actions)
 [![release-badge][]][release]
+[![maven-badge][]][maven] 
 
 # swagger-coverage
-Swagger-coverage gives a full picture about coverage of API tests (regression) based on OAS 2 (Swagger). 
+Swagger-coverage gives a full picture about coverage of API tests (regression) based on OAS (Swagger). 
 By saying coverage we mean not a broad theme functionality, but presence (or absence) of calls defined by API methods, parameters, return codes or other conditions which corresponds specification of API.
 
 ![Swagger Coverage Report](.github/swagger-coverage.png)
@@ -18,45 +22,31 @@ The next stage is to compare saved result with generated conditions from current
 You can use swagger-coverage with any language and framework. You need to have proxy/filter/interceptor that accumulates data in swagger format. 
 Swagger-coverage have rest-assured integration from the box.
 
-* Add dependencies and filter to your test client
-Add repository to pom.xml
-```xml
- <repositories>
-        <repository>
-            <id>viclovsky</id>
-            <url>https://dl.bintray.com/viclovsky/maven/</url>
-        </repository>
- </repositories>
-```
+> There is also a Karate integration, which has its own [manual](/swagger-coverage-karate/README.md).
 
 Add filter dependency:
 ```xml
  <dependency>
-     <groupId>com.github.viclovsky.swagger.coverage</groupId>
+     <groupId>com.github.viclovsky</groupId>
      <artifactId>swagger-coverage-rest-assured</artifactId>
      <version>${latest-swagger-coverage-version}</version>
  </dependency>
 ```
 or if use gradle, it can be added like
-```
-repositories {
-    maven { url 'https://dl.bintray.com/viclovsky/maven' }
-}
-```
 
 ```
-compile "com.github.viclovsky.swagger.coverage:swagger-coverage-rest-assured:$latest-swagger-coverage-version"
+compile "com.github.viclovsky:swagger-coverage-rest-assured:$latest-swagger-coverage-version"
 ```
 
-Just add filter into test client SwaggerCoverageRestAssured. For instance, as presented below:
+Just add filter into test client SwaggerCoverageRestAssured (SwaggerCoverageV3RestAssured for v3). For instance, as presented below:
 ```java
 RestAssured.given().filter(new SwaggerCoverageRestAssured())
 ```
 
 * Download and run command line.
 Download zip archive and unpack it. Don't forget to replace {latest-swagger-coverage-version} to latest version. 
 ```
-wget https://dl.bintray.com/viclovsky/maven/com/github/viclovsky/swagger/coverage/swagger-coverage-commandline/{latest-swagger-coverage-version}/swagger-coverage-commandline-{latest-swagger-coverage-version}.zip
+wget https://github.com/viclovsky/swagger-coverage/releases/download/{latest-swagger-coverage-version}/swagger-coverage-{latest-swagger-coverage-version}.zip
 unzip swagger-coverage-commandline-{latest-swagger-coverage-version}.zip
 ```
 
@@ -67,7 +57,7 @@ Here is help of unzip swagger-commandline
 
   Options:
   * -s, --spec
-      Path to swagger specification.
+      Path to local or URL to remote swagger specification.
   * -i, --input
       Path to folder with generated files with coverage.
     -c, --configuration
@@ -146,7 +136,7 @@ This rule create condition for comparing declared and received status.
 Condition marked as *covered* when result not contains any of undeclared status.
 *Uncovered* state of this condition indicates missed status in original swagger-documentation 
 or server errors.
-Options for this rules are placed in *only-declareted-status* subsection in *rules* sections.
+Options for this rules are placed in *only-declared-status* subsection in *rules* sections.
 
 
 You can setup next options:
@@ -159,7 +149,7 @@ You can setup next options:
 
     ....
 
-    "only-declareted-status" : {
+    "only-declared-status" : {
       "enable" : true
     }
   },
@@ -208,14 +198,17 @@ You can setup next options:
 
 **filename** - filename for html report.
 
+**numberFormat** - [Extended Java decimal format](https://freemarker.apache.org/docs/ref_builtins_number.html#topic.extendedJavaDecimalFormat) to control how numbers are displayed in the report.
+
 ````
 {
   ....
 
   "writers": {
       "html": {
         "locale": "ru",
-        "filename":"report.html"
+        "filename":"report.html",
+        "numberFormat": "0.##"
       }
   }
 }
@@ -228,14 +221,17 @@ To customize your http report with your own template set full path to the templa
   ....
   
   "writers": {
-    "hml": {
+    "html": {
       ....
       "customTemplatePath": "/full/path/to/report_custom.ftl"
     }
   }
 }
 ````
 
+[Look here](https://github.com/swagger-api/swagger-parser/blob/master/modules/swagger-parser-core/src/main/java/io/swagger/v3/parser/core/models/ParseOptions.java) to see all available options.
+
+
 ## Demo
 I have prepared several tests. Thus you are able to have a look and touch swagger-coverage. Just run ```run.sh``` script.
 
@@ -244,7 +240,8 @@ Swagger-coverage works fine with clients which were generated from swagger (for
 Because all methods/parameters which will be saved are 100% compatible with current API specification. 
 
 ## Requirements 
-For a moment swagger-coverage  is compatible only with OpenApi specification v2. It is possible that swagger-coverage will support other versions.
+
+For a moment swagger-coverage  is compatible only with OpenApi specifications v2 & v3. It is possible that swagger-coverage will support other versions.
 
 ## Pull Requests
 My project is open for any enhancement. So, your help is much appreciated. Please, feel free to open your pull request or issue and I will consider it in several days.
@@ -253,7 +250,12 @@ My project is open for any enhancement. So, your help is much appreciated. Pleas
 [Victor Orlovsky](https://github.com/viclovsky)
 
 ## Contributing to swagger-coverage
-Thanks to all people who contributed. Especially [@TemaMak](https://github.com/TemaMak) who have contributed significant improvements to swagger-coverage.
+Thanks to all people who contributed. Especially 
+
+* [@TemaMak](https://github.com/TemaMak) 
+* [@Emilio-Pega](https://github.com/Emilio-Pega)
+
+who have contributed significant improvements to swagger-coverage.
 
 ## License
 Swagger coverage is released under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0)

build.gradle.kts

@@ -3,16 +3,15 @@ import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
     }
 }
 
 plugins {
     java
-    id("io.spring.dependency-management") version "1.0.6.RELEASE"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
 }
 
-group = "com.github.viclovsky.swagger.coverage"
+group = "com.github.viclovsky"
 version = version
 
 val root = rootProject.projectDir
@@ -23,33 +22,42 @@ java {
 }
 
 configure(subprojects) {
-    group = "com.github.viclovsky.swagger.coverage"
+    group = "com.github.viclovsky"
     version = version
 
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "java")
     apply(plugin = "java-library")
-    apply(from = "$gradleScriptDir/maven.gradle")
-    apply(from = "$gradleScriptDir/github-publish.gradle")
 
     configure<DependencyManagementExtension> {
         imports {
             mavenBom("com.fasterxml.jackson:jackson-bom:2.9.8")
         }
         dependencies {
-            dependency("org.freemarker:freemarker:2.3.29")
-            dependency("io.swagger:swagger-models:1.6.2")
-            dependency("io.swagger:swagger-compat-spec-parser:1.0.52")
-            dependency("org.slf4j:slf4j-simple:1.7.12")
-            dependency("log4j:log4j:1.2.17")
-            dependency("com.beust:jcommander:1.78")
-            dependency("junit:junit:4.13.1")
+            dependency("org.freemarker:freemarker:2.3.31")
+
+            //swagger 2.x
+            dependency("io.swagger:swagger-models:1.6.6")
+            //swagger 3.x
+            dependency("io.swagger.core.v3:swagger-core:2.2.0")
+            dependency("io.swagger.core.v3:swagger-models:2.2.0")
+            dependency("io.swagger.parser.v3:swagger-parser:2.0.32")
+
+            dependency("org.slf4j:slf4j-api:1.7.32")
+            dependency("ch.qos.logback:logback-classic:1.2.10")
+
+            dependency("com.beust:jcommander:1.81")
+            dependency("junit:junit:4.13.2")
             dependency("org.hamcrest:hamcrest:2.2")
-            dependency("io.rest-assured:rest-assured:4.3.1")
-            dependency("com.github.tomakehurst:wiremock:2.24.1")
-            dependency("com.fasterxml.jackson.core:jackson-core:2.10.1")
-            dependency("com.fasterxml.jackson.core:jackson-databind:2.10.1")
-            dependency("org.springframework:spring-web:5.2.6.RELEASE")
+            dependency("com.jayway.jsonpath:json-path-assert:2.7.0")
+            dependency("io.rest-assured:rest-assured:4.4.0")
+            dependency("com.github.tomakehurst:wiremock:2.27.2")
+            dependency("com.fasterxml.jackson.core:jackson-core:2.12.3")
+            dependency("com.fasterxml.jackson.core:jackson-databind:2.12.3")
+            dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3")
+            dependency("com.fasterxml.jackson.core:jackson-annotations:2.12.3")
+            dependency("org.springframework:spring-web:5.3.7")
+            dependency("com.intuit.karate:karate-core:1.2.0.RC1")
         }
     }
 
@@ -72,6 +80,10 @@ configure(subprojects) {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
+    tasks.withType<GenerateModuleMetadata> {
+        enabled = false
+    }
+
     artifacts.add("archives", sourceJar)
     artifacts.add("archives", javadocJar)
 
@@ -94,6 +106,8 @@ configure(subprojects) {
             ))
         }
     }
+
+    apply(from = "$gradleScriptDir/maven-publish.gradle")
 }
 
 repositories {