You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/09 13:22:46 UTC
[isis] branch master updated: ISIS-2426: rename isis/core-parent ->
isis/isis-parent
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 90a9b61 ISIS-2426: rename isis/core-parent -> isis/isis-parent
90a9b61 is described below
commit 90a9b61ff006f9ab51588ca30e29392d77c5df47
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 9 15:22:25 2020 +0200
ISIS-2426: rename isis/core-parent -> isis/isis-parent
to align folder with artifact name
---
.../modules/ROOT/pages/cutting-a-release.adoc | 16 +-
.../ROOT/pages/post-release-successful.adoc | 2 +-
antora/pom.xml | 2 +-
core/pom.xml | 4 +-
isis-parent/pom.xml | 973 +++++++++++++++++++++
pom.xml | 4 +-
6 files changed, 987 insertions(+), 14 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index 1190121..eac5714 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -10,7 +10,7 @@ The release process consists of:
* Members of the Apache Isis PMC xref:comguide:ROOT:verifying-releases.adoc[verifying] and voting on the release
* the release manager performing post-release tasks, for either a xref:comguide:ROOT:post-release-successful.adoc[successful] or an xref:comguide:ROOT:post-release-unsuccessful.adoc[unsuccessful] vote.
-Apache Isis itself is released in one go, everything is ultimately a child of `core-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
+Apache Isis itself is released in one go, everything is ultimately a child of `isis-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
This section details the process for formally releasing this module.
The subsequent sections describe how other committers can xref:comguide:ROOT:verifying-releases.adoc[verify a release] and how the release manager can then perform xref:comguide:ROOT:post-release-successful.adoc[post-release] activities and set up for the next development iteration.
@@ -56,11 +56,11 @@ grep SNAPSHOT $(/bin/find . -name pom.xml | grep -v target sort)
The only mention of `SNAPSHOT` should be in the `revision` property of the root `core-prent/pom.xml` file.
-Finally, switch to the `core-parent` directory:
+Finally, switch to the `isis-parent` directory:
[source,bash,subs="attributes+"]
----
-cd core-parent
+cd isis-parent
----
=== License headers
@@ -123,7 +123,7 @@ mvn license:download-licenses
groovy ../scripts/checkmissinglicenses.groovy
----
-WARNING: this groovy script assumes it is being run from the `core-parent` directory.
+WARNING: this groovy script assumes it is being run from the `isis-parent` directory.
The Maven plugin creates a `license.xml` file in the `target/generated-resources` directory of each module.
The script then searches for these `licenses.xml` files, and compares them against the contents of the `supplemental-models.xml` file.
@@ -206,12 +206,12 @@ git branch $ISISBRANCH
git worktree add ../isis-release $ISISBRANCH
----
-* Switch to the `core-parent` directory in the new worktree:
+* Switch to the `isis-parent` directory in the new worktree:
+
[source,bash,subs="attributes+"]
----
cd ../isis-release
-cd core-parent
+cd isis-parent
----
=== Bump `revision` property to `$ISISREL`
@@ -261,7 +261,7 @@ Since the `<version>` has already been updated, we just use `mvn deploy` to uplo
We activate the (inherited) `apache-release` profile to bring in the `gpg` plugin for code signing.
The build creates a zip of the directory, so before executing the release we remove any other files.
-Still in the `core-parent` directory:
+Still in the `isis-parent` directory:
[source,bash]
----
@@ -353,7 +353,7 @@ Previously we bumped to the next development snapshot.
However, this approach doesn't play well with CI/CD when Apache Isis is mounted as a git submodule, so instead we always use `2.0.0-SNAPSHOT` for all development work.
====
-Therefore (still in the `core-parent` directory):
+Therefore (still in the `isis-parent` directory):
[source,bash,subs="attributes+"]
----
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 23e9870..5fd2f92 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -532,7 +532,7 @@ You will probably want to create a new JIRA ticket for these updates (or if mino
Check (via link:http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache%22%20a%3A%22apache%22[search.maven.org]) whether there is a newer version of the Apache parent `org.apache:apache`.
-If there are, merge in these changes to the `core-parent` POM.
+If there are, merge in these changes to the `isis-parent` POM.
=== Update plugin versions
diff --git a/antora/pom.xml b/antora/pom.xml
index e110709..ce04bff 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../core-parent/pom.xml</relativePath>
+ <relativePath>../isis-parent/pom.xml</relativePath>
</parent>
<artifactId>antora</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 89a8dcc..fbb889d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../core-parent/pom.xml</relativePath>
+ <relativePath>../isis-parent/pom.xml</relativePath>
</parent>
<artifactId>isis</artifactId>
@@ -167,7 +167,7 @@
<simpleslackapi.version>1.2.0</simpleslackapi.version>
<slf4j-api.version>1.7.26</slf4j-api.version> <!-- as provided by spring-boot, needed to solve convergence issues -->
<spring-framework.version>5.2.8.RELEASE</spring-framework.version>
- <spring-boot.version>2.3.2.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in core-parent/pom.xml -->
+ <spring-boot.version>2.3.2.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in isis-parent/pom.xml -->
<summernote.version>0.8.11</summernote.version>
<swagger-core.version>1.6.0</swagger-core.version>
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
new file mode 100644
index 0000000..2978965
--- /dev/null
+++ b/isis-parent/pom.xml
@@ -0,0 +1,973 @@
+<?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.
+-->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ This pom is a copy of org.apache:apache, the idea being to also inherit
+ from org.springframework.boot:spring-boot-starter-parent.
+
+ As little as possible has been changed. The customisations are clearly identified.
+ Where the customisations clash with existing (eg project metadata stuff),
+ then the original from org.apache:apache have been commented out.
+ -->
+
+ <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ -->
+
+ <!-- ORG.APACHE:APACHE : commented out : start
+
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ <packaging>pom</packaging>
+
+ ORG.APACHE:APACHE : commented out : end -->
+
+ <!-- APACHE ISIS customisation 1/7: start -->
+
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.3.2.RELEASE</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!-- APACHE ISIS customisation 1/7: end -->
+
+
+ <!-- ORG.APACHE:APACHE : commented out : start
+
+ <name>The Apache Software Foundation</name>
+ <description>
+ The Apache Software Foundation provides support for the Apache community of open-source software projects.
+ The Apache projects are characterized by a collaborative, consensus based development process, an open and
+ pragmatic software license, and a desire to create high quality software that leads the way in its field.
+ We consider ourselves not simply a group of projects sharing a server, but rather a community of developers
+ and users.
+ </description>
+ <url>https://www.apache.org/</url>
+
+ ORG.APACHE:APACHE : commented out : end -->
+
+ <!-- APACHE ISIS customisation 2/7: start -->
+ <name>Apache Isis</name>
+ <description>Parent for the core framework + extensions, starter parent pom for starter apps.</description>
+
+ <url>https://isis.apache.org</url>
+ <inceptionYear>2010</inceptionYear>
+ <!-- APACHE ISIS customisation 2/7: end -->
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>https://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <!-- ORG.APACHE:APACHE : commented out : start
+ <mailingLists>
+ <mailingList>
+ <name>Apache Announce List</name>
+ <subscribe>announce-subscribe@apache.org</subscribe>
+ <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+ <post>announce@apache.org</post>
+ <archive>https://mail-archives.apache.org/mod_mbox/www-announce/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</developerConnection>
+ <url>https://github.com/apache/maven-apache-parent/tree/${project.scm.tag}</url>
+ <tag>apache-21</tag>
+ </scm>
+ ORG.APACHE:APACHE : commented out : end -->
+
+ <!-- APACHE ISIS customisation 3/7: start -->
+ <mailingLists>
+ <mailingList>
+ <name>developers</name>
+ <archive>http://mail-archives.apache.org/mod_mbox/isis-dev/</archive>
+ <post>dev@isis.apache.org</post>
+ <subscribe>dev-subscribe@isis.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@isis.apache.org</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>users</name>
+ <archive>http://mail-archives.apache.org/mod_mbox/isis-users/</archive>
+ <post>users@isis.apache.org</post>
+ <subscribe>users-subscribe@isis.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@isis.apache.org</unsubscribe>
+ </mailingList>
+ </mailingLists>
+
+ <scm>
+ <connection>scm:git:http://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>http://github.com/apache/isis</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/browse/ISIS</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>CI</system>
+ <url>https://github.com/apache-isis-committers/isis-nightly</url>
+ </ciManagement>
+
+ <developers>
+ <developer>
+ <id>ahuber</id>
+ <name>Andi Huber</name>
+ <email>ahuber@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>bibryam</id>
+ <name>Bilgin Ibryam</name>
+ <email>bibryam@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+0</timezone>
+ </developer>
+ <developer>
+ <id>danhaywood</id>
+ <name>Dan Haywood</name>
+ <email>danhaywood@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+0</timezone>
+ </developer>
+ <developer>
+ <id>dslaughter</id>
+ <name>Dave Slaughter</name>
+ <email>dslaughter@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <id>jcvanderwal</id>
+ <name>Jeroen van der Wal</name>
+ <email>jcvanderwal@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>jdoornenbal</id>
+ <name>Johan Doornenbal</name>
+ <email>jdoornenbal@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>joergrade</id>
+ <name>Joerg Rade</name>
+ <email>joergrade@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>kevin</id>
+ <name>Kevin Meyer</name>
+ <email>kevin@apache.org</email>
+ <roles>
+ <role>pmc chair</role>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ <developer>
+ <id>madytyoo</id>
+ <name>Maurizio Taverna</name>
+ <email>madytyoo@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>mgrigorov</id>
+ <name>Martin Grigorov</name>
+ <email>mgrigorov@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ <developer>
+ <id>mnour</id>
+ <name>Mohammad Nour El-Din</name>
+ <email>mnour@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>mentor while incubating</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>oscarbou</id>
+ <name>Oscar Bou</name>
+ <email>oscarbou@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>rmatthews</id>
+ <name>Robert Matthews</name>
+ <email>rmatthews@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+0</timezone>
+ </developer>
+ <developer>
+ <id>struberg</id>
+ <name>Mark Struberg</name>
+ <email>struberg@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>mentor while incubating</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>themalkolm</id>
+ <name>Alexander Krasnuhkin</name>
+ <email>themalkolm@apache.org</email>
+ <roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+3</timezone>
+ </developer>
+ </developers>
+ <!-- APACHE ISIS customisation 3/7: end -->
+
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+ <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+ <organization.logo>https://www.apache.org/images/asf_logo_wide.gif</organization.logo>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
+ <gpg.useagent>true</gpg.useagent>
+ <arguments />
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <surefire.version>2.22.0</surefire.version>
+ <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
+
+ <delombok.output>${project.build.directory}/delombok</delombok.output>
+ </properties>
+
+<!-- <repositories> -->
+<!-- <repository> -->
+<!-- <id>apache.snapshots</id> -->
+<!-- <name>Apache Snapshot Repository</name> -->
+<!-- <url>https://repository.apache.org/snapshots</url> -->
+<!-- <releases> -->
+<!-- <enabled>false</enabled> -->
+<!-- </releases> -->
+<!-- </repository> -->
+<!-- </repositories> -->
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-docck-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <configuration>
+ <gpgArguments>
+ <arg>--digest-algo=SHA512</arg>
+ </gpgArguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-help-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.5.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- START SNIPPET: release-plugin-configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Papache-release ${arguments}</arguments>
+ <waitBeforeTagging>10</waitBeforeTagging>
+ </configuration>
+ </plugin>
+ <!-- END SNIPPET: release-plugin-configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.9.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
+
+ <!-- APACHE ISIS customisation 4/7: start -->
+ <configuration>
+ <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/target-ide/**</exclude>
+
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/node/npm</exclude>
+ <exclude>**/node/npm.cmd</exclude>
+
+ <exclude>**/*.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.launch</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/webpack.generated.js</exclude>
+
+ <exclude>**/*.pdn</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/*.rtf</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.min.js</exclude>
+ <exclude>**/fakedata/applib/services/clobs/*.dtd</exclude>
+ <exclude>**/fakedata/applib/services/clobs/*.dcl</exclude>
+ <exclude>**/fakedata/applib/services/clobs/*.soc</exclude>
+ <exclude>**/fakedata/applib/services/clobs/vs</exclude>
+ <exclude>**/fakedata/applib/services/clobs/vx</exclude>
+
+ <exclude>**/MANIFEST.MF</exclude>
+ <exclude>**/*.ucd</exclude>
+ <exclude>**/*.ucls</exclude>
+
+ <exclude>**/xml/objects/**</exclude>
+ <exclude>**/test.data</exclude>
+ <exclude>**/fixture-data/**</exclude>
+ <exclude>**/module-nav.adoc</exclude>
+ <exclude>**/component-nav.adoc</exclude>
+ <exclude>**/_nav.adoc</exclude>
+
+ <exclude>**/application.js</exclude>
+
+ <exclude>**/jquery.zclip.js</exclude>
+ <exclude>**/simple-sidebar.css</exclude>
+ <exclude>**/bootstrap-growl.js</exclude>
+ <exclude>**/moment.js</exclude>
+ <exclude>**/prism*.js</exclude>
+ <exclude>**/prism.css</exclude>
+
+ <exclude>**/bootstrap-datetimepicker.min.css</exclude>
+ <exclude>**/bootstrap-datetimepicker.css</exclude>
+ <exclude>**/select2-bootstrap.css</exclude>
+
+ <exclude>**/wicket-xhtml1.4-strict.dtd</exclude>
+
+ <exclude>**/src/main/resources/supplemental-models.xml</exclude>
+ <exclude>**/datanucleus.log</exclude>
+ <exclude>**/gradle/wrapper/gradle-wrapper.properties</exclude>
+ <exclude>**/gradlew</exclude>
+ <exclude>**/gradlew.bat</exclude>
+ <exclude>**/rebel.xml</exclude>
+ <exclude>**/translations**.po</exclude>
+ <exclude>**/translations.pot</exclude>
+ <exclude>**/intellij/launch/*.xml</exclude>
+
+ <exclude>**/swagger-ui/**</exclude>
+
+ <exclude>**/META-INF/services/**</exclude>
+ </excludes>
+ <licenses>
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL2 </licenseFamilyCategory>
+ <licenseFamilyName>Apache License 2.0</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under
+ one</pattern>
+ </patterns>
+ </license>
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>MIT</licenseFamilyCategory>
+ <licenseFamilyName>MIT Licensed</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>The MIT License (MIT)</pattern>
+ <pattern>Dual licensed under the MIT</pattern>
+ <pattern>http://prismjs.com/download.html</pattern>
+ </patterns>
+ </license>
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>CC3</licenseFamilyCategory>
+ <licenseFamilyName>Creative Commons 3.0</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>ASCII text placed in the public domain by Moby Lexical Tools, 1992.</pattern>
+ </patterns>
+ </license>
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>JMOCK</licenseFamilyCategory>
+ <licenseFamilyName>JMock</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Copyright (c) 2000-2007, jMock.org</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily
+ implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License 2.0</familyName>
+ </licenseFamily>
+ <licenseFamily
+ implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>MIT</familyName>
+ </licenseFamily>
+ <licenseFamily
+ implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>JMock</familyName>
+ </licenseFamily>
+ <licenseFamily
+ implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>XHTML</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ </configuration>
+ <!-- APACHE ISIS customisation 4/7: end -->
+
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0.5</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- START SNIPPET: release-profile -->
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <property>
+ <name>apache-release</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <build>
+ <plugins>
+ <!-- Create a source-release artifact that contains the fully buildable
+ project directory source structure. This is the artifact which is
+ the official subject of any release vote. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archiveBaseDirectory>..</archiveBaseDirectory>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We want to deploy the artifact to a staging location for perusal -->
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- APACHE ISIS customisation 5/7: end -->
+ <plugin>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok-maven-plugin</artifactId>
+ <version>1.18.0.0</version>
+ <configuration>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+ <outputDirectory>${delombok.output}</outputDirectory>
+ <addOutputDirectory>false</addOutputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>delombok</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- APACHE ISIS customisation 5/7: end -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <!-- APACHE ISIS customisation 6/7: start -->
+ <configuration>
+ <sourcepath>${delombok.output}</sourcepath>
+ <doclint>none</doclint>
+ </configuration>
+ <!-- APACHE ISIS customisation 6/7: end -->
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-release-artifacts</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- calculate checksums of source release for Apache dist area -->
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <csvSummary>false</csvSummary>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${project.artifactId}-${project.version}-source-release.zip</include>
+ <include>${project.artifactId}-${project.version}-source-release.tar*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum: don't consider error -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../mappings</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../subdomains</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ </profile>
+ <!-- END SNIPPET: release-profile -->
+
+ <!-- APACHE ISIS customisation 7/7: start -->
+ <profile>
+ <id>released</id>
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../mappings</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../subdomains</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>all</id>
+ <activation>
+ <property>
+ <name>!apache-release</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../incubator</module>
+ <module>../legacy</module>
+ <module>../mappings</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../subdomains</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>kroviz-module</id>
+ <activation>
+ <property>
+ <name>kroviz-module</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../incubator/clients/kroviz</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>demo-app-module</id>
+ <activation>
+ <property>
+ <name>demo-app-module</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../examples/demo</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>smoketests-module</id>
+ <activation>
+ <property>
+ <name>smoketests-module</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../examples/smoketests</module>
+ </modules>
+ </profile>
+
+ <!-- APACHE ISIS customisation 7/7: end -->
+
+ </profiles>
+</project>
diff --git a/pom.xml b/pom.xml
index 0337f38..17354d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<name>Apache Isis (Aggregator)</name>
<description>
Convenience aggregator POM that references all modules.
- The parent POM of the core framework is core-parent/pom.xml
+ The parent POM of the core framework is isis-parent/pom.xml
</description>
<scm>
@@ -36,7 +36,7 @@
<modules>
<module>antora</module>
- <module>core-parent</module>
+ <module>isis-parent</module>
<module>examples/demo</module>
<module>examples/smoketests</module>