[Gradle Release Plugin] - pre tag commit: '1.0.10'.

Author: gigaSproule

.circleci/config.yml

@@ -3,30 +3,62 @@ version: 2.1
 executors:
   jdk:
     docker:
-      - image: circleci/openjdk:11-jdk
+      - image: circleci/openjdk:13-jdk-buster
   jdk8:
     docker:
       - image: circleci/openjdk:8-jdk
 
 jobs:
-  build_test:
+  build_test_jdk:
     executor: jdk
     working_directory: ~/repo
     environment:
-      JAVA_TOOL_OPTIONS: -Xmx512m
+      JAVA_TOOL_OPTIONS: -Xmx3G
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.compiler.execution.strategy=in-process
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "build.gradle" }}
             - v1-dependencies-
-      - run: gradle dependencies
+      - run: ./gradlew dependencies
       - save_cache:
           paths:
             - ~/.gradle
           key: v1-dependencies-{{ checksum "build.gradle" }}
       - run:
-          command: ./gradlew --no-daemon --max-workers 2 check
+          name: Run unit tests
+          command: ./gradlew check -Dtest.profile=unit
+      - run:
+          name: Run integration tests
+          command: ./gradlew check -Dtest.profile=integration
+          no_output_timeout: 20m
+      - store_test_results:
+          path: plugin/build/tests/test
+
+  build_test_jdk8:
+    executor: jdk8
+    working_directory: ~/repo
+    environment:
+      JAVA_TOOL_OPTIONS: -Xmx3G
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.compiler.execution.strategy=in-process
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle" }}
+            - v1-dependencies-
+      - run: ./gradlew dependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle" }}
+      - run:
+          name: Run unit tests
+          command: ./gradlew check -Dtest.profile=unit
+      - run:
+          name: Run integration tests
+          command: ./gradlew check -Dtest.profile=integration
           no_output_timeout: 20m
       - store_test_results:
           path: plugin/build/tests/test
@@ -35,14 +67,15 @@ jobs:
     executor: jdk8
     working_directory: ~/repo
     environment:
-      JAVA_TOOL_OPTIONS: -Xmx3200m
+      JAVA_TOOL_OPTIONS: -Xmx3G
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.compiler.execution.strategy=in-process
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "build.gradle" }}
             - v1-dependencies-
-      - run: gradle dependencies
+      - run: ./gradlew dependencies
       - save_cache:
           paths:
             - ~/.gradle
@@ -51,104 +84,124 @@ jobs:
           command: |
             older_gradle_versions=(3.5.1 4.10.3)
             for gradle_version in ${older_gradle_versions[@]} ; do
-                ./gradlew --no-daemon --max-workers 2 clean check -Dtest.gradleVersion=${gradle_version}
+                ./gradlew clean check -Dtest.gradleVersion=${gradle_version}
             done
           no_output_timeout: 20m
 
   test_sample:
     executor: jdk
     working_directory: ~/repo
     environment:
-      JAVA_TOOL_OPTIONS: -Xmx512m
+      JAVA_TOOL_OPTIONS: -Xmx3G
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.compiler.execution.strategy=in-process
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "build.gradle" }}
             - v1-dependencies-
-      - run: ./gradlew --no-daemon dependenices
+      - run: ./gradlew dependencies
       - save_cache:
           paths:
             - ~/.gradle
           key: v1-dependencies-{{ checksum "build.gradle" }}
       - run:
           command: |
-            ./gradlew --no-daemon install -x test
-            ./gradlew --no-daemon -b sample/groovy-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/groovy-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/java-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/java-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/kotlin-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/kotlin-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/scala-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
-            ./gradlew --no-daemon -b sample/scala-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
+            ./gradlew publishToMavenLocal -x test
+            ./gradlew -b sample/groovy-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/groovy-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/java-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/java-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/kotlin-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/kotlin-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/scala-spring-boot-jaxrs/build.gradle clean generateSwaggerDocumentation
+            ./gradlew -b sample/scala-spring-boot-mvc/build.gradle clean generateSwaggerDocumentation
 
   release:
-    executor: jdk
+    executor: jdk8
     working_directory: ~/repo
     environment:
-      JAVA_TOOL_OPTIONS: -Xmx512m
+      JAVA_TOOL_OPTIONS: -Xmx3G
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.compiler.execution.strategy=in-process
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "build.gradle" }}
             - v1-dependencies-
-      - run: gradle dependencies
+      - run: ./gradlew dependencies
+      - add_ssh_keys:
+          fingerprints:
+            - '05:aa:42:b1:4d:4a:9f:bf:71:10:c2:2a:f3:cf:31:9c'
+      - run:
+          name: Set Git globals
+          command: |
+            git config --global user.email "[email protected]"
+            git config --global user.name "Circle CI"
+      - run: ./gradlew release -Prelease.useAutomaticVersion=true -Pbintray_apiKey=${BINTRAY_APIKEY} -Pbintray_user=${BINTRAY_USER} -Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET}
       - save_cache:
           paths:
             - ~/.gradle
           key: v1-dependencies-{{ checksum "build.gradle" }}
-      - run: ./gradlew --no-daemon release -Prelease.useAutomaticVersion=true
 
 workflows:
   version: 2
   build:
     jobs:
-      - build_test:
+      - build_test_jdk:
+          filters:
+            branches:
+              ignore:
+                - master
+      - build_test_jdk8:
           filters:
             branches:
               ignore:
                 - master
       - test_gradle:
-          requires:
-            - build_test
           filters:
             branches:
               ignore:
                 - master
       - test_sample:
           requires:
+            - build_test_jdk
+            - build_test_jdk8
             - test_gradle
           filters:
             branches:
               ignore:
                 - master
   build_release:
     jobs:
-      - build_test:
+      - build_test_jdk:
           filters:
             branches:
               only:
                 - master
-      - test_gradle:
-          requires:
-            - build_test
+      - build_test_jdk8:
           filters:
             branches:
               only:
                 - master
-      - test_sample:
-          requires:
-            - test_gradle
+      - test_gradle:
           filters:
             branches:
               only:
                 - master
-      - release:
+      - test_sample:
           requires:
-            - test_sample
+            - build_test_jdk
+            - build_test_jdk8
+            - test_gradle
           filters:
             branches:
               only:
                 - master
+#      - release:
+#          requires:
+#            - test_sample
+#          filters:
+#            branches:
+#              only:
+#                - master

CONTRIBUTING

@@ -12,7 +12,7 @@ Always write a clear log message for your commits. One-line messages are fine fo
 
 ```
 $ git commit -m "A brief summary of the commit
-> 
+>
 > A paragraph describing what changed and its impact."
 ```
 
@@ -26,15 +26,15 @@ $ git commit -m "A brief summary of the commit
 ## To run integration tests
 This plugin uses the [gradle testkit](https://docs.gradle.org/current/userguide/test_kit.html), so requires the testClasses task to be run before hand to get the classes into the test plugin classpath.
 ```bash
-./gradlew testClasses
+./gradlew :plugin:testClasses
 ```
 
 N.B. for reliable test runs in an IDE, it's best to include this as a Gradle build step as part of the test run configuration.
 
 ## To run tests against different versions of Gradle
 This plugin will by default run the tests against Gradle 4.7. To change which version it runs tests against, `test.gradleVersion` system property is required.
 ```bash
-./gradlew clean test -Dtest.gradleVersion=4.0
+./gradlew clean :plugin:test -Dtest.gradleVersion=4.0
 ```
 
 ## To release
@@ -43,6 +43,6 @@ This plugin uses the [gradle-release](https://github.com/researchgate/gradle-rel
 In `~/.gradle/gradle.properties`, `bintray_user` and `bintray_apiKey` need to be set for publishing to Bintray and `gradle.publish.key` and `gradle.publish.secret` for publishing to the central Gradle repository.
 
 ```bash
-./gradlew release -Prelease.useAutomaticVersion=true
+./gradlew :plugin:release -Prelease.useAutomaticVersion=true
 ```
 

build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id 'java'
-    id 'maven'
     id 'idea'
     id 'net.researchgate.release' version '2.8.1'
-    id 'com.github.ben-manes.versions' version '0.25.0'
-    id 'com.dorongold.task-tree' version '1.4'
+    id 'com.github.ben-manes.versions' version '0.29.0'
+    id 'com.dorongold.task-tree' version '1.5'
 }
 
 allprojects {
@@ -31,13 +30,12 @@ allprojects {
     ext {
         jacksonVersion = '2.10.0'
         springVersion = '5.2.0.RELEASE'
-        kotlinVersion = '1.3.50'
+        kotlinVersion = '1.3.72'
         swaggerVersion = '1.5.23'
         javaxVersion = '2.1.1'
     }
+}
 
-    test {
-        maxHeapSize '512m'
-        jvmArgs '-Xmx512m'
-    }
+release {
+    preCommitText = '[skip ci]'
 }

gradle.properties

@@ -1 +1 @@
-version=1.0.9
+version=1.0.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java-tests/src/main/java/com/benjaminsproule/swagger/gradleplugin/test/java/jaxrs/TestResourceWithClassAnnotation.java

@@ -1,6 +1,7 @@
 package com.benjaminsproule.swagger.gradleplugin.test.java.jaxrs;
 
 import com.benjaminsproule.swagger.gradleplugin.test.model.*;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.*;
 
 import javax.ws.rs.*;
@@ -167,4 +168,27 @@ public String createdRequest() {
     public OuterJsonSubType innerJsonSubType() {
         return new OuterJsonSubType();
     }
+
+    @ApiOperation("With JsonViewOne specification")
+    @Path("/root/withoutannotation/withjsonview1")
+    @GET
+    @JsonView(TestJsonViewOne.class)
+    public TestJsonViewEntity withJsonViewOne() {
+        return null;
+    }
+
+    @ApiOperation("With JsonViewTwo specification")
+    @Path("/root/withoutannotation/withjsonview2")
+    @GET
+    @JsonView(TestJsonViewTwo.class)
+    public TestJsonViewEntity withJsonViewTwo() {
+        return null;
+    }
+
+    @ApiOperation("Entity definition has to contain all possible fields")
+    @Path("/root/withoutannotation/withoutjsonview")
+    @GET
+    public TestJsonViewEntity withoutJsonView() {
+        return null;
+    }
 }

java-tests/src/main/java/com/benjaminsproule/swagger/gradleplugin/test/java/jaxrs/TestResourceWithoutClassAnnotation.java

@@ -1,6 +1,7 @@
 package com.benjaminsproule.swagger.gradleplugin.test.java.jaxrs;
 
 import com.benjaminsproule.swagger.gradleplugin.test.model.*;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.*;
 
 import javax.ws.rs.*;
@@ -166,4 +167,27 @@ public String createdRequest() {
     public OuterJsonSubType innerJsonSubType() {
         return new OuterJsonSubType();
     }
+
+    @ApiOperation("With JsonViewOne specification")
+    @Path("/root/withoutannotation/withjsonview1")
+    @GET
+    @JsonView(TestJsonViewOne.class)
+    public TestJsonViewEntity withJsonViewOne() {
+        return null;
+    }
+
+    @ApiOperation("With JsonViewTwo specification")
+    @Path("/root/withoutannotation/withjsonview2")
+    @GET
+    @JsonView(TestJsonViewTwo.class)
+    public TestJsonViewEntity withJsonViewTwo() {
+        return null;
+    }
+
+    @ApiOperation("Entity definition has to contain all possible fields")
+    @Path("/root/withoutannotation/withoutjsonview")
+    @GET
+    public TestJsonViewEntity withoutJsonView() {
+        return null;
+    }
 }