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 2018/07/25 16:45:13 UTC
[isis] branch release-2.0.0-M1-RC2 created (now a359403)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git.
at a359403 ISIS-1810: recreating helloworld archetype
This branch includes the following new commits:
new 63c2856 Merge branch 'release-2.0.0-M1-RC1'
new 321e618 ISIS-1966: Merge branch 'maint-1.16.2'
new e36a412 ISIS-1966: fixes compile issue from merge
new 7786b4a ISIS-1810: tiny edits for docs (typo, release procedures)
new e470881 ISIS-1810: tiny edits for docs (typo, release procedures)
new da142c1 ISIS-1810: adds missing license headers. Also uses official tomcat image as base for simpleapp's Docker image
new d7b80b5 ISISJIRA: bumps revision property across all pom.xml's to 2.0.0-M1
new 6058f70 ISIS-1810: further updates to release procedures
new 6b11a1e ISIS-1810: recreating simpleapp archetype
new d50e445 ISIS-1810: further updates to release procedure
new f555b81 ISIS-1810: further updates to release procedures
new a359403 ISIS-1810: recreating helloworld archetype
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 05/12: ISIS-1810: tiny edits for docs (typo,
release procedures)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e47088181d86e6e8105d148d2f35ca8993b953e2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:18:20 2018 +0100
ISIS-1810: tiny edits for docs (typo, release procedures)
---
.../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index bc4703c..13b24e3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -59,7 +59,7 @@ export ISISREL=2.0.0-M1
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 # <2>
-export CATALINA_HOME=/c/java/apache-tomcat-8.0.30 # <3>
+export CATALINA_HOME=/c/java/apache-tomcat-9.0.10 # <3>
env | grep ISIS | sort
----
@@ -149,7 +149,7 @@ Change all of these to the release version, using:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/helloworld/pom.xml
-commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISREL}"
+git commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISREL}"
----
After release, there is a similar step at the end to set to the next development SNAPSHOT.
@@ -772,7 +772,7 @@ In the root of the Apache Isis repo, we do this for all three ``pom.xml``s with:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/helloworld/pom.xml
-commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISDEV}"
+git commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISDEV}"
----
[isis] 11/12: ISIS-1810: further updates to release procedures
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f555b81b229f55158d5a75d8dc299d5364194baf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 14:02:29 2018 +0100
ISIS-1810: further updates to release procedures
---
.../guides/cgcom/_cgcom_cutting-a-release.adoc | 137 +++++++++++----------
1 file changed, 71 insertions(+), 66 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index 3488438..35d350c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -305,6 +305,7 @@ mvn -P apache-release \
-Dgpg.passphrase="this is not really my passphrase"
git tag $ISISART-$ISISREL
+git tag $ISISART-$ISISREL-$ISISRC
----
using your own GPG passphrase, of course.
@@ -459,7 +460,7 @@ docker container rm simpleapp
Make sure you are in the correct directory and environment variables are correct.
-To recreate the *simpleapp* archetype:
+To recreate the *simpleapp* archetype, first ensure in the correct directory:
[source,bash]
----
@@ -467,48 +468,20 @@ cd example/application/simpleapp
env | grep ISIS | sort
----
-Then, run the script:
+Then, run the script (which also builds the archetype once generated) and switch to the archetype's directory:
[source,bash]
----
sh ../../../scripts/recreate-archetype.sh $ISISJIRA
+cd `pwd|sed 's/application/archetype/'`
----
The script automatically commits changes; if you wish use `git log` and
`git diff` (or a tool such as SourceTree) to review changes made.
-[[__cgcom_cutting-a-release_releasing-the-simpleapp-archetype_deploy]]
-=== Deploy
-
-Previously the release procedures used `mvn release:prepare` and `mvn release:perform`.
-These are however not compatible with `${revision}` that we now use https://maven.apache.org/maven-ci-friendly.html[for CI/CD].
-
-We therefore just use `mvn deploy` directly, activating the (inherited) `apache-release` profile that, amongst other things, brings in the `gpg` plugin for code signing.
-
-To build and deploy and tag, we use:
-
-[source,bash]
-----
-mvn -P apache-release \
- clean deploy \
- -Dgpg.passphrase="this is not really my passphrase"
-
-git tag $ISISART-$ISISREL
-----
-
-using your own GPG passphrase, of course.
-
-
-[IMPORTANT]
-====
-This requires `gpg` v2.1 or later.
-====
-
-
-
-[[__cgcom_cutting-a-release_releasing-the-simpleapp-archetype_post-prepare-sanity-check]]
-=== Post-prepare sanity check
+[[__cgcom_cutting-a-release_releasing-the-simpleapp-archetype_sanity-check]]
+=== Sanity check
_In a different session_, create a new app from the archetype.
First set up environment variables:
@@ -546,6 +519,40 @@ mvn -pl webapp jetty:run # runs as mvn jetty plugin
----
+[[__cgcom_cutting-a-release_releasing-the-simpleapp-archetype_deploy]]
+=== Deploy
+
+Back in the original session, we upload (deploy) the archetype to the staging repository.
+
+[NOTE]
+====
+Previously we used `mvn release:prepare` and `mvn release:perform` to do this.
+However not compatible with `${revision}` that we now use https://maven.apache.org/maven-ci-friendly.html[for CI/CD].
+We therefore now just use `mvn deploy` directly, activating the (inherited) `apache-release` profile that, amongst other things, brings in the `gpg` plugin for code signing.
+====
+
+To build and deploy and tag, we use:
+
+[source,bash]
+----
+mvn -P apache-release \
+ clean deploy \
+ -Dgpg.passphrase="this is not really my passphrase"
+
+git tag $ISISART-$ISISREL
+git tag $ISISART-$ISISREL-$ISISRC
+----
+
+using your own GPG passphrase, of course.
+
+
+[IMPORTANT]
+====
+This requires `gpg` v2.1 or later.
+====
+
+
+
[[__cgcom_cutting-a-release_releasing-the-helloworld-archetype]]
== Releasing `helloworld` archetype
@@ -636,48 +643,21 @@ cd example/application/helloworld
env | grep ISIS | sort
----
-Then, run the script:
+Then, run the script (which also builds the archetype once generated) and then switch to the archetype's directory:
[source,bash]
----
sh ../../../scripts/recreate-archetype.sh $ISISJIRA
+cd `pwd|sed 's/application/archetype/'`
----
-The script automatically commits changes; if you wish use `git log` and
-`git diff` (or a tool such as SourceTree) to review changes made.
-
-
-[[__cgcom_cutting-a-release_releasing-the-helloworld-archetype_deploy]]
-=== Deploy
-
-Previously the release procedures used `mvn release:prepare` and `mvn release:perform`.
-These are however not compatible with `${revision}` that we now use https://maven.apache.org/maven-ci-friendly.html[for CI/CD].
-
-We therefore just use `mvn deploy` directly, activating the (inherited) `apache-release` profile that, amongst other things, brings in the `gpg` plugin for code signing.
-
-To build and deploy and tag, we use:
-
-[source,bash]
-----
-mvn -P apache-release \
- clean deploy \
- -Dgpg.passphrase="this is not really my passphrase"
-
-git tag $ISISART-$ISISREL
-----
-
-using your own GPG passphrase, of course.
-
-
-[IMPORTANT]
-====
-This requires `gpg` v2.1 or later.
-====
+The script automatically commits its changes.
+If you wish use `git log` and `git diff` (or a tool such as SourceTree) to review changes made.
-[[__cgcom_cutting-a-release_releasing-the-helloworld-archetype_post-prepare-sanity-check]]
-=== Post-prepare sanity check
+[[__cgcom_cutting-a-release_releasing-the-helloworld-archetype_sanity-check]]
+=== Sanity check
_In a different session_, create a new app from the archetype.
First set up environment variables:
@@ -714,6 +694,31 @@ mvn clean install -o
mvn jetty:run
----
+[[__cgcom_cutting-a-release_releasing-the-helloworld-archetype_deploy]]
+=== Deploy
+
+Back in the original session, we upload (deploy) the archetype to the staging repository.
+
+To build and deploy and tag, we use:
+
+[source,bash]
+----
+mvn -P apache-release \
+ clean deploy \
+ -Dgpg.passphrase="this is not really my passphrase"
+
+git tag $ISISART-$ISISREL
+git tag $ISISART-$ISISREL-$ISISRC
+----
+
+using your own GPG passphrase, of course.
+
+
+[IMPORTANT]
+====
+This requires `gpg` v2.1 or later.
+====
+
[[__cgcom_cutting-a-release_check-close-staging-repo]]
[isis] 09/12: ISIS-1810: recreating simpleapp archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6b11a1e16e6d60cadb0a75004b15c767fb46e250
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 11:09:20 2018 +0100
ISIS-1810: recreating simpleapp archetype
---
.../resources/archetype-resources/.m2/settings.xml | 5 ++
.../application/translations.pot | 2 +-
.../resources/archetype-resources/webapp/pom.xml | 65 ++++++++++++++++++++++
.../webapp/src/main/resources/docker/Dockerfile | 30 ++++++++--
.../resources/projects/basic/archetype.properties | 2 +-
5 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml
index 3a2172d..a189f31 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml
@@ -14,5 +14,10 @@
<email>${symbol_dollar}{env.DOCKER_REGISTRY_EMAIL}</email>
</configuration>
</server>
+ <server>
+ <id>tomcat-server</id>
+ <username>admin</username>
+ <password>password</password>
+ </server>
</servers>
</settings>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
index 984c133..eec9eb3 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
@@ -23,7 +23,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-07-21 14:40:56+\n"
+"POT-Creation-Date: 2018-07-25 11:04:30+\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index b60b51e..a9fcf2b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -229,6 +229,71 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>skinny-war</id>
+ <activation>
+ <property>
+ <name>skinny-war</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <warName>${maven-war-plugin.warName}</warName>
+ <packagingExcludes>%regex[WEB-INF/lib/(?!simpleapp-application|simpleapp-module-simple).*.jar]</packagingExcludes>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Host>${agent.name}</Build-Host>
+ <Build-User>${user.name}</Build-User>
+ <Build-Maven>Maven ${maven.version}</Build-Maven>
+ <Build-Java>${java.version}</Build-Java>
+ <Build-OS>${os.name}</Build-OS>
+ <Build-Label>${project.version}</Build-Label>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ using:
+ mvn -pl webapp -s .m2/settings.xml -D deploy-to-tomcat tomcat7:deploy-only
+ -->
+ <profile>
+ <id>deploy-to-tomcat</id>
+ <activation>
+ <property>
+ <name>deploy-to-tomcat</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <url>http://localhost:8080/manager/text</url>
+ <server>tomcat-server</server>
+ <path>/ROOT</path>
+ <warFile>${project.build.directory}/${maven-war-plugin.warName}.war</warFile>
+ <update>true</update>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/docker/Dockerfile b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/docker/Dockerfile
index 4c83be7..304264d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/docker/Dockerfile
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/docker/Dockerfile
@@ -1,4 +1,26 @@
-FROM incodehq/tomcat
-RUN rm -rf ${DEPLOYMENT_DIR}/ROOT
-COPY ${docker-plugin.resource.include} ${DEPLOYMENT_DIR}/ROOT.war
-EXPOSE 8080
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+FROM tomcat:9.0.10-jre8-alpine
+
+RUN rm -rf ${CATALINA_HOME}/webapps/examples
+RUN rm -rf ${CATALINA_HOME}/webapps/docs
+RUN rm -rf ${CATALINA_HOME}/webapps/ROOT
+
+COPY ${docker-plugin.resource.include} ${CATALINA_HOME}/webapps/ROOT.war
+EXPOSE 8080
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index d44ae9f..b99990d 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sat Jul 21 14:47:26 BST 2018
+#Wed Jul 25 11:09:14 BST 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[isis] 12/12: ISIS-1810: recreating helloworld archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a359403c7e8547f5a271510dad1a3cd0597db63f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 14:05:15 2018 +0100
ISIS-1810: recreating helloworld archetype
---
.../META-INF/maven/archetype-metadata.xml | 6 ++
.../resources/archetype-resources/.m2/settings.xml | 15 +++++
.../src/main/resources/archetype-resources/pom.xml | 64 ++++++++++++++++++++--
.../resources/projects/basic/archetype.properties | 2 +-
4 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
index a3eedd3..eccc1b1 100644
--- a/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -42,6 +42,12 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
+ <directory>.m2</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
<directory></directory>
<includes>
<include>logging-dn-enhance.properties</include>
diff --git a/example/archetype/helloworld/src/main/resources/archetype-resources/.m2/settings.xml b/example/archetype/helloworld/src/main/resources/archetype-resources/.m2/settings.xml
new file mode 100644
index 0000000..7f43e5c
--- /dev/null
+++ b/example/archetype/helloworld/src/main/resources/archetype-resources/.m2/settings.xml
@@ -0,0 +1,15 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>tomcat-server</id>
+ <username>admin</username>
+ <password>password</password>
+ </server>
+ </servers>
+</settings>
diff --git a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
index 04db3d6..5a01087 100644
--- a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
@@ -139,7 +139,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <artifactId>isis-core-plugins-eventbus-axon</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -150,10 +150,6 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
<type>pom</type>
@@ -187,5 +183,63 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>skinny-war</id>
+ <activation>
+ <property>
+ <name>skinny-war</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <warName>${maven-war-plugin.warName}</warName>
+ <packagingExcludes>%regex[WEB-INF/lib/(?!common-A|common-B).*.jar]</packagingExcludes>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Host>${agent.name}</Build-Host>
+ <Build-User>${user.name}</Build-User>
+ <Build-Maven>Maven ${maven.version}</Build-Maven>
+ <Build-Java>${java.version}</Build-Java>
+ <Build-OS>${os.name}</Build-OS>
+ <Build-Label>${project.version}</Build-Label>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>deploy-to-tomcat</id>
+ <activation>
+ <property>
+ <name>deploy-to-tomcat</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <url>http://localhost:8080/manager/text</url>
+ <server>tomcat-server</server>
+ <path>/ROOT</path>
+ <warFile>${project.build.directory}/${maven-war-plugin.warName}.war</warFile>
+ <update>true</update>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
index 52aa686..9509412 100644
--- a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sat Jul 21 14:53:45 BST 2018
+#Wed Jul 25 14:05:10 BST 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[isis] 07/12: ISISJIRA: bumps revision property across all
pom.xml's to 2.0.0-M1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d7b80b576621a45fbcdba9ccd5e03a7615ae36d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:21:47 2018 +0100
ISISJIRA: bumps revision property across all pom.xml's to 2.0.0-M1
---
core/pom.xml | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8acc679..ccae8bb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,7 +46,7 @@
<inceptionYear>2010</inceptionYear>
<properties>
- <revision>2.0.0-M1-SNAPSHOT</revision>
+ <revision>2.0.0-M1</revision>
<jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index ada2eb8..3c7a73a 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <revision>2.0.0-M1-SNAPSHOT</revision>
+ <revision>2.0.0-M1</revision>
<isis.version>${revision}</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index af88d4f..a50ad68 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.0.0-M1-SNAPSHOT</revision>
+ <revision>2.0.0-M1</revision>
<isis.version>${revision}</isis.version>
<lombok.version>[1.18,)</lombok.version>
[isis] 03/12: ISIS-1966: fixes compile issue from merge
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e36a4126cc4675ff1b2fedb0033522e6def5d9b3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:10:01 2018 +0100
ISIS-1966: fixes compile issue from merge
---
.../isis/core/runtime/services/publish/PublishedObjectsDefault.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
index 8e32446..ce28f2d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
@@ -33,7 +33,6 @@ import com.google.common.collect.Multimaps;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.PublishingChangeKind;
-import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.services.RepresentsInteractionMemberExecution;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
[isis] 04/12: ISIS-1810: tiny edits for docs (typo,
release procedures)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7786b4a023050fcba53c7a774dd9fefefbbc8de8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:16:37 2018 +0100
ISIS-1810: tiny edits for docs (typo, release procedures)
---
.../main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc | 2 +-
.../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
index 638d004..d090fba 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
@@ -60,7 +60,7 @@ This deletes the entire content of `contents`, and replaces with the content und
[TIP]
====
-If you have checked out the `isis-site.git` repo into some other directory (relative to `isis.site.git), then this can be overridden by specifying `-Disis-site.dir=...` when calling `mvn`.
+If you have checked out the `isis-site.git` repo into some other directory (relative to `isis.site.git`), then this can be overridden by specifying `-Disis-site.dir=...` when calling `mvn`.
====
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index a97df7f..bc4703c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -53,7 +53,6 @@ For example:
[source,bash]
----
-cd core
export ISISTMP=/c/tmp # <1>
export ISISDEV=2.0.0-M2-SNAPSHOT
export ISISREL=2.0.0-M1
[isis] 01/12: Merge branch 'release-2.0.0-M1-RC1'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 63c2856d6d187bc0ec1fd34f11a10e9e79e30dd3
Merge: f00996b 2b483d0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 07:09:12 2018 +0100
Merge branch 'release-2.0.0-M1-RC1'
core/pom.xml | 3 +
.../application/helloworld/nb-configuration.xml | 19 --
example/application/helloworld/nbactions.xml | 50 ---
.../java/domainapp/dom/impl/HelloWorldObject.java | 32 +-
.../src/main/java/domainapp/dom/types/Name.java | 24 ++
.../src/main/java/domainapp/dom/types/Notes.java | 25 ++
.../modules/simple/dom/impl/SimpleObject.java | 29 +-
.../domainapp/modules/simple/dom/types/Name.java | 3 +-
.../domainapp/modules/simple/dom/types/Notes.java | 25 ++
example/application/simpleapp/pom.xml | 8 +-
example/archetype/helloworld/pom.xml | 141 ++++----
.../appended-resources/supplemental-models.xml | 26 --
.../META-INF/maven/archetype-metadata.xml | 136 ++++----
.../resources/archetype-resources/.gitattributes | 51 ---
.../main/resources/archetype-resources/.gitignore | 41 ---
.../src/main/resources/archetype-resources/pom.xml | 348 ++++++++++----------
.../application/isis-non-changing.properties | 4 +-
.../java/domainapp/dom/impl/HelloWorldObject.java | 32 +-
.../java/domainapp/dom/impl/HelloWorldObjects.java | 8 +-
.../src/main/java/domainapp/dom/types/Name.java | 27 ++
.../src/main/java/domainapp/dom/types/Notes.java | 28 ++
.../src/main/webapp/META-INF/context.xml | 5 +
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 7 +-
...lete.java => HelloWorldObject_delete_Test.java} | 2 +-
....java => HelloWorldObject_updateName_Test.java} | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
example/archetype/simpleapp/pom.xml | 144 +++++----
.../appended-resources/supplemental-models.xml | 26 --
.../META-INF/maven/archetype-metadata.xml | 359 ++++++++++-----------
.../resources/archetype-resources/.gitlab-ci.yml | 28 +-
.../resources/archetype-resources/.m2/settings.xml | 8 +-
.../archetype-resources/application/pom.xml | 2 +-
.../fixture/scenarios/DomainAppDemo.java | 6 +-
.../manifest/isis-non-changing.properties | 4 +-
.../bdd/specglue/BootstrappingGlue.java | 4 +-
...ingGlue.java => BootstrappingGlueAbstract.java} | 25 +-
.../application/translations.pot | 105 ++++--
.../archetype-resources/module-simple/pom.xml | 42 ++-
.../domainapp/modules/simple/SimpleModule.java | 6 +-
.../modules/simple/dom/impl/SimpleObject.java | 51 +--
.../simple/dom/impl/SimpleObjectRepository.java | 58 ----
.../modules/simple/dom/impl/SimpleObjects.java | 13 +-
.../domainapp/modules/simple/dom/types/Name.java | 6 +-
.../domainapp/modules/simple/dom/types/Notes.java | 28 ++
.../simple/fixture/SimpleObject_persona.java | 6 +-
.../modules/simple/dom/impl/SimpleObject_Test.java | 7 +-
.../simple/dom/impl/SimpleObjects_Test.java | 9 +-
.../integtests/SimpleModuleIntegTestAbstract.java | 6 +-
.../tests/SimpleObjectMenu_IntegTest.java | 30 +-
.../integtests/tests/SimpleObject_IntegTest.java | 42 ++-
.../module-simple/translations.pot | 105 ++++--
.../src/main/resources/archetype-resources/pom.xml | 288 ++++++++---------
.../resources/archetype-resources/webapp/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 7 +-
.../resources/projects/basic/archetype.properties | 2 +-
scripts/recreate-archetype.sh | 6 +-
scripts/updateGeneratedArchetypeSources.groovy | 274 ++++++++--------
59 files changed, 1385 insertions(+), 1400 deletions(-)
[isis] 02/12: ISIS-1966: Merge branch 'maint-1.16.2'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 321e618b61f5472f48310593ca9ebdcb71122b77
Merge: 63c2856 5d9f4f7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 07:19:42 2018 +0100
ISIS-1966: Merge branch 'maint-1.16.2'
# Conflicts:
# core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
.../RepresentsInteractionMemberExecution.java | 35 ++++++++++++++++++++++
.../services/publish/PublishedObjectsDefault.java | 13 ++++++--
.../application/simpleapp/webapp/lib/.gitignore | 5 ----
3 files changed, 45 insertions(+), 8 deletions(-)
diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
index 9c59317,208a356..8e32446
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
@@@ -32,7 -32,8 +32,9 @@@ import com.google.common.collect.Immuta
import com.google.common.collect.Multimaps;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
+ import org.apache.isis.applib.annotation.PublishedObject;
+ import org.apache.isis.applib.services.RepresentsInteractionMemberExecution;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@@ -45,9 -46,9 +47,9 @@@ import org.apache.isis.schema.utils.jax
/**
* Captures which objects were created, updated or deleted in the course of a transaction.
*/
- public class PublishedObjectsDefault implements PublishedObjects {
+ public class PublishedObjectsDefault implements PublishedObjects, RepresentsInteractionMemberExecution {
- //region > constructor, fields
+ // -- constructor, fields
private UUID transactionUuid;
private final int sequence;
private final String userName;
@@@ -72,10 -73,10 +74,9 @@@
this.numberObjectPropertiesModified = numberObjectPropertiesModified;
this.changesByAdapter = changesByAdapter;
}
- //endregion
-
- // -- transactionId, completedAt, user
- //region > transactionId, sequence completedAt, user
++ // -- transactionId, sequence completedAt, user
@Programmatic
@Override
public UUID getTransactionId() {
[isis] 06/12: ISIS-1810: adds missing license headers. Also uses
official tomcat image as base for simpleapp's Docker image
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit da142c12a119c81a1a35d2c60cc04753443d07cd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:29:34 2018 +0100
ISIS-1810: adds missing license headers. Also uses official tomcat image as base for simpleapp's Docker image
---
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 18 +++++++++++++
core/webdocker/src/main/assembly/assembly.xml | 19 ++++++++++++++
.../conf/Catalina/localhost/host-manager.xml | 19 ++++++++++++++
.../conf/Catalina/localhost/manager.xml | 19 ++++++++++++++
.../webdocker/src/main/resources/docker/Dockerfile | 18 +++++++++++++
.../webapp/src/main/resources/docker/Dockerfile | 30 +++++++++++++++++++---
6 files changed, 119 insertions(+), 4 deletions(-)
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index 6c0c866..8a9a1b3 100644
--- a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.viewer.wicket.model.models;
import org.jmock.Expectations;
diff --git a/core/webdocker/src/main/assembly/assembly.xml b/core/webdocker/src/main/assembly/assembly.xml
index 8afdfe6..a27ada1 100644
--- a/core/webdocker/src/main/assembly/assembly.xml
+++ b/core/webdocker/src/main/assembly/assembly.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
diff --git a/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/host-manager.xml b/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/host-manager.xml
index bdb7b8e..c006bf5 100644
--- a/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/host-manager.xml
+++ b/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/host-manager.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<Context privileged="true" antiResourceLocking="false"
docBase="${catalina.home}/webapps/host-manager">
<Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="^.*$" />
diff --git a/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/manager.xml b/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/manager.xml
index 73b8e13..b9ee448 100644
--- a/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/manager.xml
+++ b/core/webdocker/src/main/resources/catalina_home/conf/Catalina/localhost/manager.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<Context privileged="true" antiResourceLocking="false"
docBase="${catalina.home}/webapps/manager">
<Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="^.*$" />
diff --git a/core/webdocker/src/main/resources/docker/Dockerfile b/core/webdocker/src/main/resources/docker/Dockerfile
index 0f5aee6..a611d0d 100644
--- a/core/webdocker/src/main/resources/docker/Dockerfile
+++ b/core/webdocker/src/main/resources/docker/Dockerfile
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
FROM tomcat:9.0.10-jre8-alpine
RUN rm -rf ${CATALINA_HOME}/webapps/examples
diff --git a/example/application/simpleapp/webapp/src/main/resources/docker/Dockerfile b/example/application/simpleapp/webapp/src/main/resources/docker/Dockerfile
index 4c83be7..304264d 100644
--- a/example/application/simpleapp/webapp/src/main/resources/docker/Dockerfile
+++ b/example/application/simpleapp/webapp/src/main/resources/docker/Dockerfile
@@ -1,4 +1,26 @@
-FROM incodehq/tomcat
-RUN rm -rf ${DEPLOYMENT_DIR}/ROOT
-COPY ${docker-plugin.resource.include} ${DEPLOYMENT_DIR}/ROOT.war
-EXPOSE 8080
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+FROM tomcat:9.0.10-jre8-alpine
+
+RUN rm -rf ${CATALINA_HOME}/webapps/examples
+RUN rm -rf ${CATALINA_HOME}/webapps/docs
+RUN rm -rf ${CATALINA_HOME}/webapps/ROOT
+
+COPY ${docker-plugin.resource.include} ${CATALINA_HOME}/webapps/ROOT.war
+EXPOSE 8080
[isis] 08/12: ISIS-1810: further updates to release procedures
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6058f7095ff3d32b5b3e17e4e4fc44788b6b8f89
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 11:08:36 2018 +0100
ISIS-1810: further updates to release procedures
---
.../main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index 13b24e3..7e154d9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -416,7 +416,9 @@ popd
[source,bash]
----
mvn install -Dmavenmixin-docker -D docker-plugin.imageName=test/simpleapp
-docker container run -p 8080:8080 -d test/simpleapp
+docker container run -p 8080:8080 --name simpleapp -d test/simpleapp
+
+#winpty docker exec -it simpleapp bash
----
+
[NOTE]
@@ -444,8 +446,13 @@ The Kitematic UI tool is handy for viewing and interacting with running containe
====
-In each case, check the about page and confirm has been built against non-SNAPSHOT versions of the Apache Isis jars.
+To tidy up, kill and remove the container:
+[source,bash]
+----
+docker container kill simpleapp
+docker container rm simpleapp
+----
[[__cgcom_cutting-a-release_releasing-the-simpleapp-archetype_create-the-archetype]]
=== Recreate the archetype
[isis] 10/12: ISIS-1810: further updates to release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d50e445b2bdac5eefc125cd31612be5378dafa0c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 11:12:36 2018 +0100
ISIS-1810: further updates to release procedure
---
.../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index 7e154d9..3488438 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -149,7 +149,7 @@ Change all of these to the release version, using:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/helloworld/pom.xml
-git commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISREL}"
+git commit -am "${ISISJIRA}: bumps revision property across all pom.xml's to ${ISISREL}"
----
After release, there is a similar step at the end to set to the next development SNAPSHOT.
@@ -779,7 +779,7 @@ In the root of the Apache Isis repo, we do this for all three ``pom.xml``s with:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/helloworld/pom.xml
-git commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISDEV}"
+git commit -am "${ISISJIRA}: bumps revision property across all pom.xml's to ${ISISDEV}"
----