Skip to content

Commit 99eae96

Browse files
mpkorstanjempkorstanje
committed
[All] Use cucumber-parent:2.0.1
1 parent e098f9f commit 99eae96

File tree

13 files changed

+43
-37
lines changed

13 files changed

+43
-37
lines changed

‎continuous-deployment/deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
3-
mvn deploy -P-examples -Psign-source-javadoc --settings continuous-deployment/travis-settings.xml -DskipTests=true
3+
mvn deploy -P-examples -Psign-source-javadoc-travis --settings continuous-deployment/travis-settings.xml -DskipTests=true
44
else
55
echo "Artifacts are only deployed on a build of the master branch"
66
fi

‎examples/java-calculator-testng/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<packaging>jar</packaging>
1212
<name>Examples: Java Calculator TestNG</name>
1313

14+
<properties>
15+
<project.Automatic-Module-Name>io.cucumber.examples.testng</project.Automatic-Module-Name>
16+
</properties>
17+
1418
<dependencies>
1519
<dependency>
1620
<groupId>io.cucumber</groupId>

‎examples/java-calculator/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<packaging>jar</packaging>
1212
<name>Examples: Java Calculator</name>
1313

14+
<properties>
15+
<project.Automatic-Module-Name>io.cucumber.examples.java</project.Automatic-Module-Name>
16+
</properties>
17+
1418
<dependencies>
1519
<dependency>
1620
<groupId>io.cucumber</groupId>

‎examples/java-wicket/java-wicket-main/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</build>
1515

1616
<properties>
17+
<project.Automatic-Module-Name>io.cucumber.examples.java.wicket</project.Automatic-Module-Name>
1718
<wicket.version>8.2.0</wicket.version>
1819
<jetty.version>9.4.14.v20181114</jetty.version>
1920
<jcl-over-slf4.version>1.7.25</jcl-over-slf4.version>

‎examples/java-wicket/java-wicket-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<artifactId>java-wicket-test</artifactId>
99
<name>Examples: Wicket application tested with Selenium</name>
1010

11-
1211
<properties>
12+
<project.Automatic-Module-Name>io.cucumber.examples.java.wicket</project.Automatic-Module-Name>
1313
<htmlunit.version>2.34.0</htmlunit.version>
1414
</properties>
1515

‎examples/java8-calculator/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
@@ -11,6 +12,10 @@
1112
<packaging>jar</packaging>
1213
<name>Examples: Java8 Calculator</name>
1314

15+
<properties>
16+
<project.Automatic-Module-Name>io.cucumber.examples.java8</project.Automatic-Module-Name>
17+
</properties>
18+
1419
<dependencies>
1520
<dependency>
1621
<groupId>io.cucumber</groupId>

‎examples/pom.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
@@ -48,6 +49,18 @@
4849
<build>
4950
<pluginManagement>
5051
<plugins>
52+
<plugin>
53+
<artifactId>maven-install-plugin</artifactId>
54+
<configuration>
55+
<skip>true</skip>
56+
</configuration>
57+
</plugin>
58+
<plugin>
59+
<artifactId>maven-jar-plugin</artifactId>
60+
<configuration>
61+
<skipIfEmpty>true</skipIfEmpty>
62+
</configuration>
63+
</plugin>
5164
<plugin>
5265
<artifactId>maven-javadoc-plugin</artifactId>
5366
<configuration>

‎examples/spring-txn/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<name>Examples: Spring Transactions</name>
1313

1414
<properties>
15-
<spring-boot.version>2.1.5.RELEASE</spring-boot.version>
15+
<project.Automatic-Module-Name>io.cucumber.examples.spring.txn</project.Automatic-Module-Name>
16+
<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
1617
</properties>
1718

1819
<dependencyManagement>

‎guice/src/test/java/io/cucumber/guice/matcher/ElementsAreAllEqualMatcher.java

-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.cucumber.guice.matcher;
22

33
import org.hamcrest.Description;
4-
import org.hamcrest.Factory;
54
import org.hamcrest.Matcher;
65

76
import java.util.Collection;
@@ -21,14 +20,6 @@ public class ElementsAreAllEqualMatcher<E> extends ElementsAreAllMatcher<E> {
2120
* For example:
2221
* <pre>assertThat(Arrays.asList("foo", "foo", "foo"), elementsAreAllEqual())</pre>
2322
*/
24-
/**
25-
* Creates a matcher for {@link java.util.Collection}s that matches when every element is the same. Elements are
26-
* tested for equality using java.lang.Object.equals().
27-
* <p/>
28-
* For example:
29-
* <pre>assertThat(Arrays.asList("foo", "foo", "foo"), elementsAreAllEqual())</pre>
30-
*/
31-
@Factory
3223
public static <E> Matcher<Collection<? extends E>> elementsAreAllEqual() {
3324
return new ElementsAreAllEqualMatcher<E>();
3425
}

‎guice/src/test/java/io/cucumber/guice/matcher/ElementsAreAllUniqueMatcher.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.cucumber.guice.matcher;
22

33
import org.hamcrest.Description;
4-
import org.hamcrest.Factory;
54
import org.hamcrest.Matcher;
65

76
import java.util.Collection;
@@ -20,7 +19,6 @@ public class ElementsAreAllUniqueMatcher<E> extends ElementsAreAllMatcher<E> {
2019
* For example:
2120
* <pre>assertThat(Arrays.asList("foo", "bar", "baz"), elementsAreAllUnique())</pre>
2221
*/
23-
@Factory
2422
public static <E> Matcher<Collection<? extends E>> elementsAreAllUnique() {
2523
return new ElementsAreAllUniqueMatcher<E>();
2624
}

‎java8/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<project.Automatic-Module-Name>io.cucumber.java8</project.Automatic-Module-Name>
16-
<typetools.version>0.5.0</typetools.version>
16+
<typetools.version>0.6.1</typetools.version>
1717
</properties>
1818

1919
<dependencies>

‎kotlin-java8/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<project.Automatic-Module-Name>io.cucumber.kotlin.java8</project.Automatic-Module-Name>
16-
<kotlin.version>1.3.0</kotlin.version>
16+
<kotlin.version>1.3.41</kotlin.version>
1717
</properties>
1818

1919
<dependencies>
@@ -65,7 +65,7 @@
6565
<plugin>
6666
<artifactId>maven-jar-plugin</artifactId>
6767
<configuration>
68-
<skip>true</skip>
68+
<skipIfEmpty>true</skipIfEmpty>
6969
</configuration>
7070
</plugin>
7171
<plugin>

‎pom.xml

+7-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.cucumber</groupId>
55
<artifactId>cucumber-parent</artifactId>
6-
<version>1.0.4</version>
6+
<version>2.0.1</version>
77
</parent>
88
<artifactId>cucumber-jvm</artifactId>
99
<version>5.0.0-SNAPSHOT</version>
@@ -44,15 +44,15 @@
4444
<gherkin.version>5.1.0</gherkin.version>
4545
<cucumber-expressions.version>7.0.2</cucumber-expressions.version>
4646
<datatable.version>1.1.14</datatable.version>
47-
<tag-expressions.version>1.1.1</tag-expressions.version>
47+
<tag-expressions.version>2.0.2</tag-expressions.version>
4848

4949
<!--Test Dependencies-->
5050
<junit.version>4.12</junit.version>
51-
<junit-jupiter.version>5.3.1</junit-jupiter.version>
52-
<junit-platform.version>1.3.1</junit-platform.version>
53-
<hamcrest.version>1.3</hamcrest.version>
54-
<assertj.core.version>3.12.2</assertj.core.version>
55-
<mockito.version>2.28.2</mockito.version>
51+
<junit-jupiter.version>5.5.1</junit-jupiter.version>
52+
<junit-platform.version>1.5.1</junit-platform.version>
53+
<hamcrest.version>2.1</hamcrest.version>
54+
<assertj.core.version>3.13.1</assertj.core.version>
55+
<mockito.version>3.0.0</mockito.version>
5656

5757
<!--Maven plugins-->
5858
<groovy.version>2.5.5</groovy.version>
@@ -323,17 +323,6 @@
323323
</dependencies>
324324
</plugin>
325325

326-
<plugin>
327-
<groupId>org.apache.maven.plugins</groupId>
328-
<artifactId>maven-compiler-plugin</artifactId>
329-
<version>3.6.2</version>
330-
<configuration>
331-
<encoding>UTF-8</encoding>
332-
<source>1.8</source>
333-
<target>1.8</target>
334-
</configuration>
335-
</plugin>
336-
337326
<plugin>
338327
<groupId>org.apache.maven.plugins</groupId>
339328
<artifactId>maven-javadoc-plugin</artifactId>

0 commit comments

Comments
 (0)