Skip to content

Commit

Permalink
Merge branch 'release/1.2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jangalinski committed Oct 17, 2022
2 parents 7aac70c + 7ea2273 commit dc79375
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Extensions that make working with the JVM BDD testing tool [jgiven](https://jgiv
<dependency>
<groupId>io.toolisticon.testing</groupId>
<artifactId>jgiven-kotlin</artifactId>
<version>1.2.2</version>
<version>1.2.3.0</version>
<scope>test</scope>
</dependency>
Expand Down
39 changes: 14 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,29 @@

<groupId>io.toolisticon.testing</groupId>
<artifactId>jgiven-kotlin</artifactId>
<version>1.2.2.1</version>
<version>1.2.3.0</version>

<name>${project.artifactId}</name>
<description>jgiven kotlin extension</description>
<url>https://github.com/toolisticon/jgiven-kotlin/</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<kotlin.version>1.7.10</kotlin.version>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>

<jgiven.version>1.2.2</jgiven.version>
<spring-boot.version>2.3.7.RELEASE</spring-boot.version>
<jgiven.version>1.2.3</jgiven.version>
<spring-boot.version>2.7.4</spring-boot.version>

<!-- TEST -->
<assertj.version>3.23.1</assertj.version>

<!-- MAVEN -->
<project.encoding>UTF-8</project.encoding>
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.encoding}</project.reporting.outputEncoding>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -75,26 +78,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>2.0.3</version>
<scope>test</scope>
</dependency>

</dependencies>

<repositories>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray.kotlin.eap</id>
<name>Bintray Kotlin EAP Repository</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
</repositories>

<build>
<defaultGoal>clean jacoco:prepare-agent package</defaultGoal>

Expand Down Expand Up @@ -237,7 +226,7 @@
<!-- resources -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
Expand Down Expand Up @@ -271,7 +260,7 @@
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.7.10</version>
<version>1.7.20</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -341,7 +330,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.18.0</version>
<version>1.19.0</version>
<configuration>
<gitFlowConfig>
<productionBranch>master</productionBranch>
Expand Down Expand Up @@ -417,7 +406,7 @@
<!-- Install -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</plugin>

<!-- Enforce -->
Expand Down

0 comments on commit dc79375

Please sign in to comment.