You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/31 09:37:58 UTC
[isis] 03/04: ISIS-2192: still faffing ... upgrading cucumber
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 633586c572858cc2882bfb17d82c6fa5ddde2bde
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 19:27:56 2020 +0000
ISIS-2192: still faffing ... upgrading cucumber
---
.../modules/comguide/pages/cutting-a-release.adoc | 56 ++++++++++++++++++++++
core/pom.xml | 18 +++++++
starters/pom.xml | 3 +-
.../adoc/modules/integtestsupport/pages/about.adoc | 6 +--
testing/pom.xml | 7 ---
.../adoc/modules/specsupport/pages/about.adoc | 2 +-
testing/specsupport/applib/pom.xml | 14 +-----
.../integration/ObjectFactoryForIntegration.java | 3 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
9 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
index d97e131..ad2ff21 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
@@ -326,6 +326,62 @@ git fetch
The remote tags aren't visible locally but can be seen link:https://github.com/apache/isis/tags[online].
====
+== Update starter apps
+
+For each starter app, we create a new branch and make the changes there, pushing the branch back if the sanity check passes.
+
+
+* for helloworld, the steps are:
++
+[source,bash,subs="attributes+"]
+----
+git checkout master
+git pull --ff-only
+
+git checkout -b $ISISBRANCH
+
+mvn versions:update-parent -DparentVersion=$ISISREL
+mvn versions:set -DnewVersion=$ISISREL
+
+mvn clean install -o
+mvn spring-boot:run
+----
+
+* for simple app, the steps are almost the same:
++
+[source,bash,subs="attributes+"]
+----
+git checkout master
+git pull --ff-only
+
+git checkout -b $ISISBRANCH
+
+mvn versions:update-parent -DparentVersion=$ISISREL
+mvn versions:set -DnewVersion=$ISISREL
+
+mvn clean install -o -Dmetamodel.lockdown
+mvn -pl webapp test -o -Dmavendeps.lockdown
+----
++
+Approve any failed lockdown tests (the mavendeps will fail first time arround because the dependencies on Apache Isis itself have just be bumped).
+Repeat, then run the app as a sanity check:
++
+[source,bash,subs="attributes+"]
+----
+mvn clean install -o -Dmetamodel.lockdown
+mvn -pl webapp test -o -Dmavendeps.lockdown
+
+mvn -pl webapp spring-boot:run
+----
+
+* For both apps, push the release branch to origin once ok:
++
+[source,bash,subs="attributes+"]
+----
+git push -u origin $ISISBRANCH
+----
+
+
== Voting
Once the artifacts have been uploaded, you can call a vote.
diff --git a/core/pom.xml b/core/pom.xml
index be0bdbc..fb908e1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -91,6 +91,8 @@
<commons-lang3.version>3.9</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
+ <cucumber.version>5.1.2</cucumber.version>
+
<cxf-rt-rs-client.version>3.3.4</cxf-rt-rs-client.version>
<danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
@@ -1554,6 +1556,22 @@
<version>${wicketstuff.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-spring</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/starters/pom.xml b/starters/pom.xml
index fc6dd4d..82599ae 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -50,6 +50,7 @@ under the License.
<approvaltests.version>4.0.2</approvaltests.version>
<resteasy.version>4.4.1.Final</resteasy.version>
+
</properties>
<build>
@@ -252,7 +253,7 @@ under the License.
<version>${maven-surefire-plugin.version}</version>
<executions>
<execution>
- <id>default-test</id>
+ <id>unit-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
diff --git a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
index 611d6f9..668ca98 100644
--- a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
+++ b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
@@ -550,17 +550,15 @@ Thus, the setup fixture runs the setup for the "inner-most" "leaf-level" modules
-
-
== Maven Configuration
-Apache Isis' integ test support is most easily configured through a dependency on the `isis-mavendeps-testing` module:
+Apache Isis' integ test support is most easily configured through a dependency on the `isis-mavendeps-integtests` module:
[source,xml]
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index 87c62b2..2030f64 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -125,13 +125,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
<modules>
<module>fakedata</module>
diff --git a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
index 64b8603..7ecc567 100644
--- a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
+++ b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
@@ -244,7 +244,7 @@ Apache Isis' BDD spec support is most easily configured through a dependency on
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integspecs</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index 4bfd111..489c0f5 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -28,8 +28,7 @@
<git-plugin.propertiesDir>org/apache/isis/testing/specsupport.applib</git-plugin.propertiesDir>
<cucumber.impl>io.cucumber</cucumber.impl>
- <cucumber.version>4.8.0</cucumber.version>
-
+
</properties>
<dependencies>
@@ -43,25 +42,14 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-spring</artifactId>
- <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
-<!--
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
--->
</dependency>
</dependencies>
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index 8023645..849921c 100644
--- a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -26,8 +26,9 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.RequiredArgsConstructor;
-import cucumber.api.java.ObjectFactory;
import cucumber.runtime.CucumberException;
+import io.cucumber.core.backend.ObjectFactory;
+
@RequiredArgsConstructor
public class ObjectFactoryForIntegration implements ObjectFactory {
diff --git a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
index da5c2d6..632d969 100644
--- a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
+++ b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
@@ -321,7 +321,7 @@ Apache Isis' unit test support is most easily configured through a dependency on
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>