fix(gradlebuildconfig): add pom.xml & change swaggerV2 from runtime to compile for maven project (#438)

add new pom.xml generate task in jar task && change swaggerV2 from implementation to api

.github/workflows/gradle-build.yml

@@ -0,0 +1,82 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+name: Build
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  validation:
+    name: "Gradle wrapper validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.5
+      - uses: gradle/wrapper-validation-action@v1.0.4
+  build:
+    name: "Build and publish"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.5
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v2.1.6
+        if: env.SONAR_TOKEN != null && env.SONAR_TOKEN != ''
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Build
+        id: gradle
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: check
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+      - name: "Comment build scan url"
+        uses: actions/github-script@v5
+        if: github.event_name == 'pull_request' && failure()
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '❌ ${{ github.workflow }} failed: ${{ steps.gradle.outputs.build-scan-url }}'
+            })
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action/composite@v1
+        if: always()
+        with:
+          files: '**/test-results/**/*.xml'
+      - name: Analyze with SonarCloud
+        continue-on-error: true
+        if: env.SONAR_TOKEN != null && env.SONAR_TOKEN != ''
+        uses: eskatos/gradle-command-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          arguments: sonarqube -Psonar.organization=swagger2markup
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+      - name: Publish to Sonatype
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: eskatos/gradle-command-action@v1
+        env:
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }}
+          ORG_GRADLE_PROJECT_sonatypePassword : ${{ secrets.SONATYPE_PASSWORD }}
+        with:
+          arguments: publishToSonatype
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true          

.gitignore

@@ -6,3 +6,5 @@ build
 /.classpath
 /.project
 /.settings/
+*.ipr
+*.iws

.travis.yml

@@ -1,18 +0,0 @@
-language: java
-jdk:
-- openjdk8
-before_install:
-- chmod +x gradlew
-after_success:
-- ./gradlew jacocoTestReport coveralls
-- ./gradlew artifactoryPublish -PbintrayUsername="${BINTRAY_USER}" -PbintrayApiKey="${BINTRAY_KEY}"
-- ./gradlew publishGhPages -PgithubUser="${GITHUB_USER}" -PgithubPassword="${GITHUB_PASSWORD}"
-  --stacktrace
-notifications:
-  slack: swagger2markup:Zz5kz0SnvtG6aVvZUM8yMkER
-env:
-  global:
-  - secure: SPKolgUdjIa/uJ+7/B/GPFlsa8IZg7NuZdFA8zROTaqew/xu+oX7qVGImseeBpPIEPJb02ac6hr7Y3/zvv0GJxIPtIbyDzVh73ImQUhT1ttLYGJfITAWqAPFF7RNNMtuOl3S2DLZ5OMJddkcFp00pa9nyI82Gk47B8GsaGIntAI=
-  - secure: nXXuHfvFACZwdiFM3Ta0x/f49N7cAgi0AMkgEnQrh/2xWlvQk2z2ySGJQLkhJ7Wy8LDY7Yt1b1GUt6DlP3PuFFMW/cT4iARewqiJRXZXxUQz8fpTDeTo1nmVmW/zzII6Qj3QHM3NRbR/xDOVSJiT30Hnq2hcCBQJWYsTICmzjRk=
-  - secure: Ia/wJ572M2II76roFeGEVCzIiktG4v2j/reSn60fpk1gnoEPQEObL4j1dbVCgXBLz54YWcaQ3mICvOfBPPEl9IIV3Y6DDE2sBOmB3soznfdA/YVnJx0h0f1pfXu1dwqoiv1sgc1wewQuUWq+FV7xeDhFE3cnh9CXIexe9ykip8k=
-  - secure: GWfhYDsHRmTfOuEOIcHY8kT4jKBTbdhNLDQ/2amY06xenFblb4pEn6pgmn4IdK3ytjNovnZPTOOK8HqdEjhbfIGoQt6PZwuyANn4Df+zdqOC0+V+7DFG2QhEhbRCyEwPlDqTPjxlOMfAmvjFuY/NvQywoF3PYUyMfJwUV8ehmYk=

README.adoc

@@ -2,7 +2,7 @@
 :author: Robert Winkler
 :hardbreaks:
 
-image:https://travis-ci.org/Swagger2Markup/swagger2markup.svg?branch=master["Build Status", link="https://travis-ci.org/Swagger2Markup/swagger2markup"] image:https://coveralls.io/repos/Swagger2Markup/swagger2markup/badge.svg["Coverage Status", link="https://coveralls.io/r/Swagger2Markup/swagger2markup"] image:https://api.codacy.com/project/badge/grade/498a6a39d7d84ff687546359f58ee18d["Codacy code quality", link="https://www.codacy.com/app/robwin/swagger2markup"] image:https://api.bintray.com/packages/swagger2markup/Maven/swagger2markup/images/download.svg[link="https://bintray.com/swagger2markup/Maven/swagger2markup/_latestVersion"] image:http://img.shields.io/badge/license-ASF2-blue.svg["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"] image:https://img.shields.io/badge/Twitter-rbrtwnklr-blue.svg["Twitter", link="https://twitter.com/rbrtwnklr"] image:https://badges.gitter.im/Join%20Chat.svg[link="https://gitter.im/RobWin/swagger2markup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
+image:https://coveralls.io/repos/Swagger2Markup/swagger2markup/badge.svg["Coverage Status", link="https://coveralls.io/r/Swagger2Markup/swagger2markup"] image:https://api.codacy.com/project/badge/grade/498a6a39d7d84ff687546359f58ee18d["Codacy code quality", link="https://www.codacy.com/app/robwin/swagger2markup"] image:https://api.bintray.com/packages/swagger2markup/Maven/swagger2markup/images/download.svg[link="https://bintray.com/swagger2markup/Maven/swagger2markup/_latestVersion"] image:http://img.shields.io/badge/license-ASF2-blue.svg["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"] image:https://img.shields.io/badge/Twitter-rbrtwnklr-blue.svg["Twitter", link="https://twitter.com/rbrtwnklr"] image:https://badges.gitter.im/Join%20Chat.svg[link="https://gitter.im/RobWin/swagger2markup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
 
 == Overview

build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.sonarqube" version "2.7"
-    id "com.jfrog.bintray" version "1.8.4"
     id "me.champeau.gradle.jmh" version "0.4.8"
     id 'org.asciidoctor.convert' version '1.6.0'
-    id "com.jfrog.artifactory" version "4.9.5"
     id "org.ajoberstar.github-pages" version "1.7.2"
+    id "io.github.gradle-nexus.publish-plugin"  version "1.1.0"
 }
 apply plugin: 'idea'
 apply from: "${rootDir}/libraries.gradle"
@@ -16,22 +15,17 @@ ext {
 allprojects {
     apply plugin: 'jacoco'
     apply plugin: 'me.champeau.gradle.jmh'
-    apply plugin: 'com.jfrog.artifactory'
 
     version = '2.0.0-SNAPSHOT'
     group 'io.github.swagger2markup'
     description = 'swagger2markup Build'
 
-    repositories {        
+    repositories {
         jcenter()
         mavenCentral()
-        maven {
-            name "OSS Snapshots"
-            url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
-        }
     }
 }
-artifactoryPublish.skip = true // apply to all projects except the root
+//artifactoryPublish.skip = true // apply to all projects except the root
 
 ext {
     coreProjects = subprojects.findAll {
@@ -41,15 +35,15 @@ ext {
 
 configure(project.coreProjects) {
     apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
-    apply plugin: 'com.jfrog.bintray'
     apply from: "${rootDir}/publishing.gradle"
     apply plugin: 'jacoco'
 
     tasks.withType(JavaCompile) {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
         options.deprecation = true
         options.encoding = 'UTF-8'
         options.compilerArgs += ["-Xlint:unchecked", "-parameters"]
@@ -67,10 +61,18 @@ configure(project.coreProjects) {
     }
 }
 
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}
+
 sonarqube {
     properties {
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.organization", "swagger2markup"
         property "sonar.projectName", "swagger2markup"
-        property "sonar.projectKey", "swagger2markup_swagger2markup"
+        property "sonar.projectKey", "Swagger2Markup_swagger2markup"
         property "sonar.links.homepage", "https://github.com/Swagger2Markup/swagger2markup"
         property "sonar.links.ci", "https://travis-ci.org/Swagger2Markup/swagger2markup"
         property "sonar.links.scm", "https://github.com/Swagger2Markup/swagger2markup"
@@ -99,6 +101,10 @@ subprojects {
         // exclude subprojects that don't produce a jar file or by design.
         if (!project.name.equals('swagger2markup-bom') && !project.name.equals('swagger2markup-documentation')) {
             jar {
+                into("META-INF/maven/$project.group/$project.name") {
+                    from {generatePomFileForMavenJavaPublication}
+                    rename ".*", "pom.xml"
+                }
                 inputs.property('moduleName', moduleName)
                 manifest.attributes(
                         'Automatic-Module-Name': moduleName
@@ -110,33 +116,6 @@ subprojects {
 
 tasks.check.dependsOn tasks.jacocoTestReport
 
-
 test {
     dependsOn(subprojects.test) // required by cobertura to aggregate report
 }
-
-artifactory {
-    contextUrl = 'https://oss.jfrog.org'
-    resolve {
-        repository {
-            repoKey = 'libs-release'
-            maven = true
-        }
-    }
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local' //The Artifactory repository key to publish to
-            //when using oss.jfrog.org the credentials are from Bintray. For local build we expect them to be found in
-            //~/.gradle/gradle.properties, otherwise to be set in the build server
-            username = project.hasProperty('bintrayUsername') ? project.bintrayUsername : System.getenv('BINTRAY_USER')
-            password = project.hasProperty('bintrayApiKey') ? project.bintrayApiKey : System.getenv('BINTRAY_KEY')
-        }
-        defaults {
-            publications('mavenJava')
-        }
-    }
-    if (System.properties['https.proxyHost']) {
-        clientConfig.proxy.host = System.properties['https.proxyHost']
-        clientConfig.proxy.port = System.properties['https.proxyPort'].toInteger()
-    }
-}

publishing.gradle

@@ -44,38 +44,6 @@ artifacts {
     archives javadocJar
 }
 
-bintray {
-    user = project.hasProperty('bintrayUsername') ? project.property('bintrayUsername') : ''
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : ''
-    dryRun = false //Whether to run this as dry-run, without deploying
-    publish = true //If version should be auto published after an upload
-    publications = ['mavenJava']
-    pkg {
-        repo = 'Maven'
-        name = "${projectArtifactId}"
-        userOrg = "${projectArtifactId}"
-        websiteUrl = "${projectUrl}"
-        issueTrackerUrl = issuesUrl
-        vcsUrl = scmUrl
-        desc =  project.description
-        licenses = ['Apache-2.0']
-        version {
-            name = project.version
-            vcsTag = "v${project.version}"
-            gpg {
-                sign = true //Determines whether to GPG sign the files. The default is false
-                //Optional. The passphrase for GPG signing'
-                passphrase = project.hasProperty('gpgPassphrase') ? project.property('gpgPassphrase') : ''
-            }
-            mavenCentralSync {
-                sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
-                user = project.hasProperty('ossUser') ? project.property('ossUser') : '' //OSS user token
-                password = project.hasProperty('ossPassword') ? project.property('ossPassword') : '' //OSS user password
-            }
-        }
-    }
-}
-
 publishing {
     publications {
         mavenJava(MavenPublication) {

swagger2markup-builder/src/main/java/io/github/swagger2markup/markup/builder/LineSeparator.java

@@ -20,15 +20,15 @@ package io.github.swagger2markup.markup.builder;
 
 public enum LineSeparator {
     /**
-     * Line separator for Unix systems (<tt>\n</tt>).
+     * Line separator for Unix systems (<code>\n</code>).
      */
     UNIX("\n"),
     /**
-     * Line separator for Windows systems (<tt>\r\n</tt>).
+     * Line separator for Windows systems (<code>\r\n</code>).
      */
     WINDOWS("\r\n"),
     /**
-     * Line separator for Macintosh systems (<tt>\r</tt>).
+     * Line separator for Macintosh systems (<code>\r</code>).
      */
     MAC("\r");
 

swagger2markup-core/src/main/java/io/github/swagger2markup/config/LineSeparator.java

@@ -20,15 +20,15 @@ package io.github.swagger2markup.config;
 
 public enum LineSeparator {
     /**
-     * Line separator for Unix systems (<tt>\n</tt>).
+     * Line separator for Unix systems (<code>\n</code>).
      */
     UNIX("\n"),
     /**
-     * Line separator for Windows systems (<tt>\r\n</tt>).
+     * Line separator for Windows systems (<code>\r\n</code>).
      */
     WINDOWS("\r\n"),
     /**
-     * Line separator for Macintosh systems (<tt>\r</tt>).
+     * Line separator for Macintosh systems (<code>\r</code>).
      */
     MAC("\r");
 

swagger2markup-documentation/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'org.asciidoctor.convert'
 apply plugin: 'org.ajoberstar.github-pages'
 
-artifactoryPublish.skip=true
+//artifactoryPublish.skip=true
 sonarqube.skipProject=true
 
 asciidoctor.dependsOn test

swagger2markup/build.gradle

@@ -28,7 +28,7 @@ dependencies {
     implementation implLibraries.guava
     implementation implLibraries.paleo
     implementation implLibraries.slf4j
-    implementation implLibraries.swaggerV2
+    api implLibraries.swaggerV2
     implementation implLibraries.vavr
     testImplementation testLibraries.assertj
     testImplementation testLibraries.assertjDiff