From 4eecf0ebc988fafe202c24621c1fb42e9536a9a1 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 21 Sep 2020 13:41:12 +0200 Subject: [PATCH 1/5] Move Maven coordinates to new group ID and artifact IDs Refs #165 --- cli/pom.xml | 10 +++++----- core/pom.xml | 6 +++--- pom.xml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index a2522bb7..b3df88e7 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - com.github.joschi.openapi-diff - parent + org.openapitools.openapidiff + openapi-diff-parent 2.0.0-SNAPSHOT - cli + openapi-diff-cli jar openapi-diff-cli @@ -15,8 +15,8 @@ - com.github.joschi.openapi-diff - core + org.openapitools.openapidiff + openapi-diff-core 2.0.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 63074e15..c6542256 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - com.github.joschi.openapi-diff - parent + org.openapitools.openapidiff + openapi-diff-parent 2.0.0-SNAPSHOT - core + openapi-diff-core jar openapi-diff-core diff --git a/pom.xml b/pom.xml index c2100463..9a427bdf 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ cli - com.github.joschi.openapi-diff - parent + org.openapitools.openapidiff + openapi-diff-parent 2.0.0-SNAPSHOT pom From a7e4f992f8dfd12a8d5ad036d7d93426d2b9a0e6 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 21 Sep 2020 13:53:07 +0200 Subject: [PATCH 2/5] Replace maven-assembly-plugin with maven-shade-plugin Refs #165 --- cli/pom.xml | 29 +++++++++++++++-------------- pom.xml | 10 +++++----- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index b3df88e7..dd63c18f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -40,25 +40,26 @@ org.apache.maven.plugins - maven-assembly-plugin - - - jar-with-dependencies - - - - com.qdesrame.openapi.diff.cli.Main - - - openapi-diff - + maven-shade-plugin - make-assembly package - single + shade + + false + true + all + + + com.qdesrame.openapi.diff.cli.Main + + + + + + diff --git a/pom.xml b/pom.xml index 9a427bdf..dc73df1d 100644 --- a/pom.xml +++ b/pom.xml @@ -219,11 +219,6 @@ maven-javadoc-plugin 3.2.0 - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - org.apache.maven.plugins maven-surefire-plugin @@ -249,6 +244,11 @@ maven-deploy-plugin 2.8.2 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + From 377efd5136c732fa1368c2ccd7439431a81d5e9a Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 21 Sep 2020 13:54:48 +0200 Subject: [PATCH 3/5] Add openapi-diff-core to dependencyManagement in Parent POM --- cli/pom.xml | 1 - pom.xml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/pom.xml b/cli/pom.xml index dd63c18f..3de55575 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -17,7 +17,6 @@ org.openapitools.openapidiff openapi-diff-core - 2.0.0-SNAPSHOT commons-cli diff --git a/pom.xml b/pom.xml index dc73df1d..0fdea616 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,11 @@ + + org.openapitools.openapidiff + openapi-diff-core + 2.0.0-SNAPSHOT + org.junit junit-bom From 15e96e61dd53ea6917103329ded5d7cb0e5f221b Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 21 Sep 2020 13:55:45 +0200 Subject: [PATCH 4/5] Update SCM information in Parent POM --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0fdea616..839983a8 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ - scm:git:https://github.com/joschi/openapi-diff.git - scm:git:https://github.com/joschi/openapi-diff.git - https://github.com/joschi/openapi-diff + scm:git:https://github.com/OpenAPITools/openapi-diff.git + scm:git:https://github.com/OpenAPITools/openapi-diff.git + https://github.com/OpenAPITools/openapi-diff HEAD From e816ffc6b309808c064573bc0294ddabb3674f1b Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Mon, 21 Sep 2020 14:00:33 +0200 Subject: [PATCH 5/5] Update Maven coordinates and Docker image in README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d061d6d7..59e6bc3b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Compare two OpenAPI specifications (3.x) and render the difference to HTML plaintext, or Markdown files. [![Test](https://github.com/OpenAPITools/openapi-diff/workflows/Test/badge.svg)](https://github.com/OpenAPITools/openapi-diff/actions?query=branch%3Amaster+workflow%3ATest+) - +[![Maven Central](https://img.shields.io/maven-central/v/org.openapitools.openapidiff/openapi-diff-core)](https://search.maven.org/artifact/org.openapitools.openapidiff/openapi-diff-core) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM) # Requirements @@ -20,22 +20,22 @@ Compare two OpenAPI specifications (3.x) and render the difference to HTML plain # Maven -Available on [Maven Central](https://search.maven.org/artifact/com.github.joschi.openapi-diff/core) +Available on [Maven Central](https://search.maven.org/artifact/org.openapitools.openapidiff/openapi-diff-core) ```xml - com.github.joschi.openapi-diff - core + org.openapitools.openapidiff + openapi-diff-core ${openapi-diff-version} ``` # Docker -Available on [Docker Hub](https://hub.docker.com/r/joschi/openapi-diff/) as `joschi/openapi-diff`. +Available on [Docker Hub](https://hub.docker.com/r/openapitools/openapi-diff/) as `openapitools/openapi-diff`. ```bash -# docker run joschi/openapi-diff:latest +# docker run openapitools/openapi-diff:latest usage: openapi-diff --debug Print debugging information --error Print error information @@ -79,10 +79,10 @@ in readonly mode (`ro`). ```bash docker run -t \ -v $(pwd)/core/src/test/resources:/specs:ro \ - joschi/openapi-diff /specs/path_1.yaml /specs/path_2.yaml + openapitools/openapi-diff /specs/path_1.yaml /specs/path_2.yaml ``` -The remote name `joschi/openapi-diff` can be replaced with `local-openapi-diff` or the name you gave to your local image. +The remote name `openapitools/openapi-diff` can be replaced with `local-openapi-diff` or the name you gave to your local image. # Usage