Merge branch 'release/1.0.0'

.github/workflows/default.yml

@@ -6,31 +6,33 @@ on:
       - '*'
       - '**/*'
       - '!master'
+      - '!release/*'
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-
-    - name: Cache .m2
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven
-
-    - name: Prepare mvnw
-      run: chmod +x ./mvnw
-
-    - name: Build
-      run: ./mvnw clean package
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Cache .m2
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven
+
+      # Setup JDK and Maven
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11.0.5
+
+      - name: Prepare Maven Wrapper
+        run: chmod +x ./mvnw
+
+      - name: Build with Maven
+        run: ./mvnw clean verify -U -B -T4

.github/workflows/master.yml

@@ -1,50 +1,51 @@
-name: Master branch
+name: Master or release candidate branch
 
 on:
   push:
     branches:
       - master
+      - 'release/*'
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
+        uses: actions/checkout@v1
 
       - name: Cache .m2
         uses: actions/cache@v1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Prepare mvnw
-        run: chmod +x ./mvnw
-
-      - name: Build
-        run: ./mvnw clean package
+            ${{ runner.os }}-maven
 
+      # Get GPG private key into GPG
       - name: Import GPG Owner Trust
-        run: echo ${{secrets.GPG_OWNER_TRUST}} | base64 --decode | gpg --import-ownertrust
-
+        run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust
       - name: Import GPG key
-        run: echo ${{secrets.GPG_SECRET_KEYS}} | base64 --decode | gpg --import --no-tty --batch --yes --always-trust
-
-      - name: Clean settings.xml
-        run: rm -rf ~/.m2/settings.xml
+        run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
 
-      - name: Create settings.xml
-        uses: s4u/maven-settings-action@v1
+      # Setup JDK and Maven
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
         with:
-          servers: '[{"id": "ossrh", "username": "${{secrets.SONATYPE_USERNAME}}", "password": "${{secrets.SONATYPE_PASSWORD}}"}]'
+          java-version: 11.0.5
+          server-id: ossrh
+          server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
+          server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
+
+      - name: Prepare Maven Wrapper
+        run: chmod +x ./mvnw
+
+      - name: Build with Maven
+        run: ./mvnw clean verify -U -B -T4
 
       - name: Deploy a new version to central
-        run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname=${{secrets.GPG_KEYNAME}} -Dgpg.passphrase=${{secrets.GPG_PASSPHRASE}}
+        run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname=${{secrets.GPG_KEYNAME}} -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
+        env:
+          OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+

README.md

@@ -2,9 +2,22 @@
 
 Extensions that make working with the JVM BDD testing tool [jgiven](https://jgiven.org) and Kotlin even more fun.
 
-[![Build Status](https://github.com/toolisticon/jgiven-kotlin/workflows/default/badge.svg)](https://github.com/toolisticon/jgiven-kotlin/actions)
-
+[![Build Status](https://github.com/toolisticon/jgiven-kotlin/workflows/Development%20branches/badge.svg)](https://github.com/toolisticon/jgiven-kotlin/actions)
 [![sponsored](https://img.shields.io/badge/sponsoredBy-Holisticon-RED.svg)](https://holisticon.de/)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.testing/jgiven-kotlin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.testing/jgiven-kotlin)
+
+## Usage 
+
+### Maven
+```
+<dependency>
+  <groupId>io.toolisticon.testing</groupId>
+  <artifactId>jgiven-kotlin</artifactId>
+  <version>0.1.0</version>
+  <scope>test</scope>  
+</dependency>
+
+```
 
 ## Features
 
@@ -71,7 +84,7 @@ Since all classes and functions are final by default in kotlin, you have to expl
 
 Using the `JGivenKotlinStage` annotation and kotlin's "all-open" compiler plugin, this can be avoided.
 
-#### gradle
+#### Gradle
 
 ```kotlin
 plugins {
@@ -85,7 +98,7 @@ allOpen {
 }
 ```
 
-#### maven
+#### Maven
 
 ```xml
 

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>io.toolisticon.testing</groupId>
   <artifactId>jgiven-kotlin</artifactId>
-  <version>0.1.0</version>
+  <version>1.0.0</version>
 
   <name>${project.artifactId}</name>
   <description>jgiven kotlin extension</description>
@@ -16,10 +16,10 @@
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <kotlin.version>1.4.21</kotlin.version>
+    <kotlin.version>1.4.32</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
 
-    <jgiven.version>1.0.0-RC7</jgiven.version>
+    <jgiven.version>1.0.0</jgiven.version>
     <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
 
   </properties>
@@ -47,7 +47,6 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -263,7 +262,7 @@
         <plugin>
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.4.20</version>
+          <version>1.4.30</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>
@@ -288,6 +287,7 @@
             </sourceDirectories>
           </configuration>
         </plugin>
+
         <!-- Source from kotlin -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -332,7 +332,7 @@
         <plugin>
           <groupId>com.amashchenko.maven.plugin</groupId>
           <artifactId>gitflow-maven-plugin</artifactId>
-          <version>1.15.1</version>
+          <version>1.16.0</version>
           <configuration>
             <gitFlowConfig>
               <productionBranch>master</productionBranch>
@@ -356,7 +356,6 @@
           <artifactId>maven-gpg-plugin</artifactId>
           <version>1.6</version>
           <configuration>
-            <keyname>${gpg.keyname}</keyname>
             <gpgArguments>
               <arg>--batch</arg>
               <arg>--yes</arg>
@@ -428,11 +427,15 @@
                   <requireMavenVersion>
                     <version>3.6.0</version>
                   </requireMavenVersion>
+                  <requireJavaVersion>
+                    <version>11</version>
+                  </requireJavaVersion>
                 </rules>
               </configuration>
             </execution>
           </executions>
         </plugin>
+
       </plugins>
     </pluginManagement>