Skip to content

Commit

Permalink
[jgitflow]merging 'release/1.0.1' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsfrench
jsfrench committed Mar 5, 2018
2 parents bb0cce1 + 1f9fc0b commit 7d95547
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 89 deletions.
33 changes: 31 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,36 @@

<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>maven-plugin</packaging>
<name>SwaggerHub Maven Plugin</name>
<description>A maven plugin for downloading and uploading Swagger/OAS definitions from/to SwaggerHub as
part of a build process.
</description>
<url>https://github.com/jsfrench/swaggerhub-maven-plugin</url>

<scm>
<connection>scm:git:git://github.com:jsfrench/swaggerhub-maven-plugin.git</connection>
<developerConnection>scm:git:ssh://github.com:jsfrench/swaggerhub-maven-plugin.git</developerConnection>
<url>https://github.com/jsfrench/swaggerhub-maven-plugin/tree/master</url>
</scm>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>John French</name>
<email>[email protected]</email>
<organization>jsfrench</organization>
<organizationUrl>https://github.com/jsfrench</organizationUrl>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
Expand Down Expand Up @@ -87,7 +112,7 @@
<pushFeatures>true</pushFeatures>
<pushReleases>true</pushReleases>
<pushHotfixes>true</pushHotfixes>
<noDeploy>true</noDeploy>
<noDeploy>false</noDeploy>
<scmCommentPrefix>[jgitflow]</scmCommentPrefix>
<username>${git.user}</username>
<password>${git.password}</password>
Expand Down Expand Up @@ -155,6 +180,10 @@
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

</project>
25 changes: 5 additions & 20 deletions src/test/resources/testProjects/download-yaml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,18 @@
<artifactId>swaggerhub-maven-plugin-test</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Download</name>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<name>Test Download YAML</name>

<build>
<plugins>
<plugin>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<api>registry-api</api>
<owner>swagger-hub</owner>
<version>1.0.45</version>
<outputFile>target/test/swaggerhub-registry-api.yaml</outputFile>
<api>PetStoreAPI</api>
<owner>jsfrench</owner>
<version>1.0.0</version>
<outputFile>target/petStoreAPI.yaml</outputFile>
<format>yaml</format>
</configuration>
</plugin>
Expand Down
23 changes: 4 additions & 19 deletions src/test/resources/testProjects/download.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,16 @@
<version>1.0-SNAPSHOT</version>
<name>Test Download</name>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<api>registry-api</api>
<owner>swagger-hub</owner>
<version>1.0.45</version>
<outputFile>target/test/swaggerhub-registry-api.json</outputFile>
<api>PetStoreAPI</api>
<owner>jsfrench</owner>
<version>1.0.0</version>
<outputFile>target/test/petStoreAPI.json</outputFile>
</configuration>
</plugin>

Expand Down
17 changes: 1 addition & 16 deletions src/test/resources/testProjects/upload-private-force.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,13 @@
<artifactId>swaggerhub-maven-plugin-test</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Download</name>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<name>Test Upload: Private, Force</name>

<build>
<plugins>
<plugin>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<host>localhost</host>
<port>8089</port>
Expand Down
17 changes: 1 addition & 16 deletions src/test/resources/testProjects/upload-yaml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,13 @@
<artifactId>swaggerhub-maven-plugin-test</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Download</name>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<name>Test Upload YAML</name>

<build>
<plugins>
<plugin>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<host>localhost</host>
<port>8089</port>
Expand Down
17 changes: 1 addition & 16 deletions src/test/resources/testProjects/upload.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,13 @@
<artifactId>swaggerhub-maven-plugin-test</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Download</name>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<name>Test Upload</name>

<build>
<plugins>
<plugin>
<groupId>io.github.jsfrench</groupId>
<artifactId>swaggerhub-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<host>localhost</host>
<port>8089</port>
Expand Down

0 comments on commit 7d95547

Please sign in to comment.