Skip to content

Commit 00b62ff

Browse files
authored
Update Maven and Docker image coordinates (#172)
Refs #165
1 parent 15c2969 commit 00b62ff

File tree

4 files changed

+46
-41
lines changed

4 files changed

+46
-41
lines changed

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Compare two OpenAPI specifications (3.x) and render the difference to HTML plaintext, or Markdown files.
44

55
[![Test](https://github.com/OpenAPITools/openapi-diff/workflows/Test/badge.svg)](https://github.com/OpenAPITools/openapi-diff/actions?query=branch%3Amaster+workflow%3ATest+)
6-
6+
[![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)
77
[![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)
88

99
# Requirements
@@ -20,22 +20,22 @@ Compare two OpenAPI specifications (3.x) and render the difference to HTML plain
2020

2121
# Maven
2222

23-
Available on [Maven Central](https://search.maven.org/artifact/com.github.joschi.openapi-diff/core)
23+
Available on [Maven Central](https://search.maven.org/artifact/org.openapitools.openapidiff/openapi-diff-core)
2424

2525
```xml
2626
<dependency>
27-
<groupId>com.github.joschi.openapi-diff</groupId>
28-
<artifactId>core</artifactId>
27+
<groupId>org.openapitools.openapidiff</groupId>
28+
<artifactId>openapi-diff-core</artifactId>
2929
<version>${openapi-diff-version}</version>
3030
</dependency>
3131
```
3232

3333
# Docker
3434

35-
Available on [Docker Hub](https://hub.docker.com/r/joschi/openapi-diff/) as `joschi/openapi-diff`.
35+
Available on [Docker Hub](https://hub.docker.com/r/openapitools/openapi-diff/) as `openapitools/openapi-diff`.
3636

3737
```bash
38-
# docker run joschi/openapi-diff:latest
38+
# docker run openapitools/openapi-diff:latest
3939
usage: openapi-diff <old> <new>
4040
--debug Print debugging information
4141
--error Print error information
@@ -79,10 +79,10 @@ in readonly mode (`ro`).
7979
```bash
8080
docker run -t \
8181
-v $(pwd)/core/src/test/resources:/specs:ro \
82-
joschi/openapi-diff /specs/path_1.yaml /specs/path_2.yaml
82+
openapitools/openapi-diff /specs/path_1.yaml /specs/path_2.yaml
8383
```
8484
85-
The remote name `joschi/openapi-diff` can be replaced with `local-openapi-diff` or the name you gave to your local image.
85+
The remote name `openapitools/openapi-diff` can be replaced with `local-openapi-diff` or the name you gave to your local image.
8686
8787
# Usage
8888

cli/pom.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
<modelVersion>4.0.0</modelVersion>
33

44
<parent>
5-
<groupId>com.github.joschi.openapi-diff</groupId>
6-
<artifactId>parent</artifactId>
5+
<groupId>org.openapitools.openapidiff</groupId>
6+
<artifactId>openapi-diff-parent</artifactId>
77
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99

10-
<artifactId>cli</artifactId>
10+
<artifactId>openapi-diff-cli</artifactId>
1111
<packaging>jar</packaging>
1212

1313
<name>openapi-diff-cli</name>
1414
<description>CLI for openapi-diff</description>
1515

1616
<dependencies>
1717
<dependency>
18-
<groupId>com.github.joschi.openapi-diff</groupId>
19-
<artifactId>core</artifactId>
20-
<version>2.0.0-SNAPSHOT</version>
18+
<groupId>org.openapitools.openapidiff</groupId>
19+
<artifactId>openapi-diff-core</artifactId>
2120
</dependency>
2221
<dependency>
2322
<groupId>commons-cli</groupId>
@@ -40,25 +39,26 @@
4039
<plugins>
4140
<plugin>
4241
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-assembly-plugin</artifactId>
44-
<configuration>
45-
<descriptorRefs>
46-
<descriptorRef>jar-with-dependencies</descriptorRef>
47-
</descriptorRefs>
48-
<archive>
49-
<manifest>
50-
<mainClass>com.qdesrame.openapi.diff.cli.Main</mainClass>
51-
</manifest>
52-
</archive>
53-
<finalName>openapi-diff</finalName>
54-
</configuration>
42+
<artifactId>maven-shade-plugin</artifactId>
5543
<executions>
5644
<execution>
57-
<id>make-assembly</id>
5845
<phase>package</phase>
5946
<goals>
60-
<goal>single</goal>
47+
<goal>shade</goal>
6148
</goals>
49+
<configuration>
50+
<createDependencyReducedPom>false</createDependencyReducedPom>
51+
<shadedArtifactAttached>true</shadedArtifactAttached>
52+
<shadedClassifierName>all</shadedClassifierName>
53+
<transformers>
54+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
55+
<mainClass>com.qdesrame.openapi.diff.cli.Main</mainClass>
56+
</transformer>
57+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
58+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
59+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
60+
</transformers>
61+
</configuration>
6262
</execution>
6363
</executions>
6464
</plugin>

core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<modelVersion>4.0.0</modelVersion>
33

44
<parent>
5-
<groupId>com.github.joschi.openapi-diff</groupId>
6-
<artifactId>parent</artifactId>
5+
<groupId>org.openapitools.openapidiff</groupId>
6+
<artifactId>openapi-diff-parent</artifactId>
77
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99

10-
<artifactId>core</artifactId>
10+
<artifactId>openapi-diff-core</artifactId>
1111
<packaging>jar</packaging>
1212

1313
<name>openapi-diff-core</name>

pom.xml

+15-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<module>cli</module>
1313
</modules>
1414

15-
<groupId>com.github.joschi.openapi-diff</groupId>
16-
<artifactId>parent</artifactId>
15+
<groupId>org.openapitools.openapidiff</groupId>
16+
<artifactId>openapi-diff-parent</artifactId>
1717
<version>2.0.0-SNAPSHOT</version>
1818
<packaging>pom</packaging>
1919

@@ -40,9 +40,9 @@
4040
</developers>
4141

4242
<scm>
43-
<connection>scm:git:https://github.com/joschi/openapi-diff.git</connection>
44-
<developerConnection>scm:git:https://github.com/joschi/openapi-diff.git</developerConnection>
45-
<url>https://github.com/joschi/openapi-diff</url>
43+
<connection>scm:git:https://github.com/OpenAPITools/openapi-diff.git</connection>
44+
<developerConnection>scm:git:https://github.com/OpenAPITools/openapi-diff.git</developerConnection>
45+
<url>https://github.com/OpenAPITools/openapi-diff</url>
4646
<tag>HEAD</tag>
4747
</scm>
4848

@@ -71,6 +71,11 @@
7171

7272
<dependencyManagement>
7373
<dependencies>
74+
<dependency>
75+
<groupId>org.openapitools.openapidiff</groupId>
76+
<artifactId>openapi-diff-core</artifactId>
77+
<version>2.0.0-SNAPSHOT</version>
78+
</dependency>
7479
<dependency>
7580
<groupId>org.junit</groupId>
7681
<artifactId>junit-bom</artifactId>
@@ -219,11 +224,6 @@
219224
<artifactId>maven-javadoc-plugin</artifactId>
220225
<version>3.2.0</version>
221226
</plugin>
222-
<plugin>
223-
<groupId>org.apache.maven.plugins</groupId>
224-
<artifactId>maven-assembly-plugin</artifactId>
225-
<version>3.3.0</version>
226-
</plugin>
227227
<plugin>
228228
<groupId>org.apache.maven.plugins</groupId>
229229
<artifactId>maven-surefire-plugin</artifactId>
@@ -249,6 +249,11 @@
249249
<artifactId>maven-deploy-plugin</artifactId>
250250
<version>2.8.2</version>
251251
</plugin>
252+
<plugin>
253+
<groupId>org.apache.maven.plugins</groupId>
254+
<artifactId>maven-shade-plugin</artifactId>
255+
<version>3.2.4</version>
256+
</plugin>
252257
</plugins>
253258
</pluginManagement>
254259
<plugins>

0 commit comments

Comments
 (0)