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 2021/12/23 18:27:05 UTC
[isis] 05/05: Revert "ISIS-2932: merge /isis-parent/ up into root"
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
commit c98355c4c0eac7d759a92973084632fd02a53d2e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 23 19:09:27 2021 +0100
Revert "ISIS-2932: merge /isis-parent/ up into root"
This reverts commit 81164e165018db3df31e3c467776634d4067a2e6.
---
antora/pom.xml | 2 +-
core/pom.xml | 4 +-
incubator/viewers/vaadin/pom.xml | 2 -
pom.xml => isis-parent/pom.xml | 518 ++++++++-------------
pom.xml | 980 +--------------------------------------
tooling/pom.xml | 2 +-
valuetypes/asciidoc/ui/pom.xml | 2 -
valuetypes/prism/vaadin/pom.xml | 2 -
8 files changed, 199 insertions(+), 1313 deletions(-)
diff --git a/antora/pom.xml b/antora/pom.xml
index 87a9975..158149d 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis</groupId>
<artifactId>isis-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../isis-parent/pom.xml</relativePath>
</parent>
<artifactId>antora</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index db405c2..c2b8c1e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis</groupId>
<artifactId>isis-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../isis-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.core</groupId>
@@ -528,7 +528,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.6.0,)</version>
+ <version>[3.5.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[11,)</version>
diff --git a/incubator/viewers/vaadin/pom.xml b/incubator/viewers/vaadin/pom.xml
index f9f793f..70056ce 100644
--- a/incubator/viewers/vaadin/pom.xml
+++ b/incubator/viewers/vaadin/pom.xml
@@ -32,8 +32,6 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.incubator.viewer.vaadin</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/incubator/viewer/vaadin</git-plugin.propertiesDir>
-
- <enforcer.skip>true</enforcer.skip> <!-- enforcer detects a lot of issues -->
</properties>
<packaging>pom</packaging>
diff --git a/pom.xml b/isis-parent/pom.xml
similarity index 80%
copy from pom.xml
copy to isis-parent/pom.xml
index 1caf367..2403a22 100644
--- a/pom.xml
+++ b/isis-parent/pom.xml
@@ -1,25 +1,47 @@
<?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">
+<!--
+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.
- For more information, see the documentation of this POM: http://maven.apache.org/pom/asf/
+
+ 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>24</version>
+ <packaging>pom</packaging>
+
+ ORG.APACHE:APACHE : commented out : end -->
+
+ <!-- APACHE ISIS customisation 1/15: : start -->
+
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
@@ -32,44 +54,30 @@
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Isis</name>
- <description>
- Convenience aggregator POM that references all modules, some explicitely,
- others via profiles, that are not activiated per default.
- </description>
+ <!-- APACHE ISIS customisation 1/15: end -->
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy the aggregator -->
-
- <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_2016.png</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>
- <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
- <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
- <java.version>11</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- <maven.compiler.release>11</maven.compiler.release>
+ <!-- ORG.APACHE:APACHE : commented out : start
- <!-- historically was overriding Spring, as v3.0.0 breaks artifact retrieval of org.jruby:jruby (of any version) -->
- <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+ <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/15: start -->
+ <name>Apache Isis</name>
+ <description>Parent for the core framework + extensions, starter parent pom for starter apps.</description>
- <lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
- <delombok.output>${project.build.directory}/delombok</delombok.output>
- <surefire.version>2.22.2</surefire.version>
- <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
-
- <!-- set this property for all derived projects: -->
- <project.build.outputTimestamp>2021-08-22T15:43:00Z</project.build.outputTimestamp>
- </properties>
-
<url>https://isis.apache.org</url>
<inceptionYear>2010</inceptionYear>
+ <!-- APACHE ISIS customisation 2/15: end -->
<organization>
<name>The Apache Software Foundation</name>
@@ -83,6 +91,26 @@
</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-24</tag>
+ </scm>
+ ORG.APACHE:APACHE : commented out : end -->
+
+ <!-- APACHE ISIS customisation 3/15: start -->
<mailingLists>
<mailingList>
<name>developers</name>
@@ -101,9 +129,9 @@
</mailingLists>
<scm>
- <connection>scm:git:https://github.com/apache/isis.git</connection>
+ <connection>scm:git:http://github.com/apache/isis.git</connection>
<developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
- <url>https://github.com/apache/isis.git</url>
+ <url>http://github.com/apache/isis</url>
<tag>HEAD</tag>
</scm>
@@ -270,6 +298,7 @@
<timezone>+3</timezone>
</developer>
</developers>
+ <!-- APACHE ISIS customisation 3/15: end -->
<distributionManagement>
<repository>
@@ -283,8 +312,37 @@
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
</distributionManagement>
-
- <!-- breaks dependabot run: timeout due to repo not accessible
+
+ <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_2016.png</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>
+ <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
+ <!-- APACHE ISIS customisation 4/15: start -->
+ <java.version>11</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
+
+ <!-- overriding Spring, since v3.0.0 breaks artifact retrieval of org.jruby:jruby (of any version) -->
+ <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
+
+ <lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
+ <delombok.output>${project.build.directory}/delombok</delombok.output>
+ <!-- APACHE ISIS customisation 4/15: end -->
+ <surefire.version>2.22.2</surefire.version>
+ <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
+ <!-- set this property for all derived projects:
+ -->
+ <project.build.outputTimestamp>2021-08-22T15:43:00Z</project.build.outputTimestamp>
+ </properties>
+
+<!-- breaks dependabot run: timeout due to repo not accessible
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -306,8 +364,8 @@
</pluginRepository>
</pluginRepositories>
-->
-
- <build>
+
+ <build>
<pluginManagement>
<plugins>
<!-- set versions of common plugins for reproducibility, ordered alphabetically -->
@@ -489,6 +547,7 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.13</version>
+ <!-- APACHE ISIS customisation 5/15: start -->
<configuration>
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
<excludeSubProjects>true</excludeSubProjects>
@@ -624,6 +683,15 @@
<pattern>Copyright (c) 2000-2007, jMock.org</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
@@ -644,13 +712,16 @@
</licenseFamily>
</licenseFamilies>
</configuration>
+ <!-- APACHE ISIS customisation 5/15: end -->
</plugin>
+ <!-- APACHE ISIS customisation 6/15: start -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>2.8</version>
</plugin>
+ <!-- APACHE ISIS customisation 6/15: end -->
</plugins>
</pluginManagement>
<plugins>
@@ -668,6 +739,7 @@
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
+ <!-- APACHE ISIS customisation 7/15: start -->
<!-- Reference the supplemental-model artifact from module supplemental-model -->
<supplementalModelArtifacts>
@@ -696,6 +768,7 @@
${license.additional-notes}
</postDepListText>
</properties>
+ <!-- APACHE ISIS customisation 7/15: end -->
</configuration>
</execution>
</executions>
@@ -744,6 +817,7 @@
</execution>
</executions>
</plugin>
+ <!-- APACHE ISIS customisation 8/15: start -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -766,269 +840,15 @@
-->
</executions>
</plugin>
+ <!-- APACHE ISIS customisation 8/15: end -->
</plugins>
</build>
-
- <profiles>
-
- <!-- ESSENTIAL MODULES -->
-
- <profile>
- <id>essential</id>
- <activation>
- <property>
- <name>!skip.essential</name>
- </property>
- </activation>
- <modules>
- <!--
- essential modules required to run web applications and tests;
- non-essential modules can be added to the build via profiles
- (as defined below);
-
- keep module declarations in alphabetical order!
-
- also keep profiles in sync with the site documentation
- https://github.com/apache/isis/blob/master/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc
- -->
- <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>
-
- <!-- ALL MODULES -->
-
- <profile>
- <id>module-all</id>
- <activation>
- <property>
- <name>module-all</name>
- </property>
- </activation>
- <modules>
- <module>antora</module>
- <module>examples/demo</module>
- <module>incubator</module>
- <module>regressiontests</module>
- <module>tooling</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-all-except-incubator</id>
- <activation>
- <property>
- <name>module-all-except-incubator</name>
- </property>
- </activation>
- <modules>
- <module>antora</module>
- <module>examples/demo</module>
- <module>regressiontests</module>
- <module>tooling</module>
- </modules>
- </profile>
-
- <!-- NON-ESSENTIAL MODULES -->
-
- <profile>
- <id>module-antora</id>
- <activation>
- <property>
- <name>module-antora</name>
- </property>
- </activation>
- <modules>
- <module>antora</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-extensions</id>
- <activation>
- <property>
- <name>module-extensions</name>
- </property>
- </activation>
- <modules>
- <module>extensions</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-ext-secman</id>
- <activation>
- <property>
- <name>module-secman</name>
- </property>
- </activation>
- <modules>
- <module>extensions/security/secman</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-examples-demo-javafx</id>
- <activation>
- <property>
- <name>module-examples-demo-javafx</name>
- </property>
- </activation>
- <modules>
- <module>examples/demo/javafx</module>
- <!-- prerequisites ... -->
- <module>incubator/viewers/javafx</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-examples-demo-wicket</id>
- <activation>
- <property>
- <name>module-examples-demo-wicket</name>
- </property>
- </activation>
- <modules>
- <module>examples/demo/wicket/common</module>
- <module>examples/demo/wicket/jdo</module>
- <module>examples/demo/wicket/jpa</module>
- <!-- prerequisites ... -->
- <module>examples/demo/web</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-examples-demo-vaadin</id>
- <activation>
- <property>
- <name>module-examples-demo-vaadin</name>
- </property>
- </activation>
- <modules>
- <module>examples/demo/vaadin</module>
- <!-- prerequisites ... -->
- <module>incubator/viewers/vaadin</module>
- <module>examples/demo/web</module>
- <module>examples/demo/wicket/common</module>
- <module>examples/demo/wicket/jdo</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-incubator-all</id>
- <activation>
- <property>
- <name>module-incubator-all</name>
- </property>
- </activation>
- <modules>
- <module>valuetypes/asciidoc/ui/vaadin</module>
- <module>incubator/clients/kroviz</module>
- <module>incubator/viewers/javafx</module>
- <module>incubator/viewers/vaadin</module>
- </modules>
- </profile>
- <profile>
- <id>module-incubator-javafx</id>
- <activation>
- <property>
- <name>module-incubator-javafx</name>
- </property>
- </activation>
- <modules>
- <module>incubator/viewers/javafx</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-incubator-kroviz</id>
- <activation>
- <property>
- <name>module-incubator-kroviz</name>
- </property>
- </activation>
- <modules>
- <module>incubator/clients/kroviz</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-incubator-vaadin</id>
- <activation>
- <property>
- <name>module-incubator-vaadin</name>
- </property>
- </activation>
- <modules>
- <module>valuetypes/asciidoc/ui/vaadin</module>
- <module>incubator/viewers/vaadin</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-regressiontests</id>
- <activation>
- <property>
- <name>module-regressiontests</name>
- </property>
- </activation>
- <modules>
- <module>regressiontests</module>
- <!-- prerequisites ... -->
- <module>tooling</module>
- </modules>
- </profile>
-
- <profile>
- <id>module-tooling</id>
- <activation>
- <property>
- <name>module-tooling</name>
- </property>
- </activation>
- <modules>
- <module>tooling</module>
- </modules>
- </profile>
-
- <!-- RELEASE SPECIFIC PROFILES -->
-
- <profile>
- <id>sources</id>
- <activation>
- <property>
- <name>sources</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>deploy</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+ <profiles>
+ <!-- START SNIPPET: release-profile -->
<profile>
<id>apache-release</id>
+ <!-- APACHE ISIS customisation 9/15: start -->
<activation>
<property>
<name>apache-release</name>
@@ -1037,8 +857,10 @@
<properties>
<skipTests>true</skipTests>
</properties>
+ <!-- APACHE ISIS customisation 9/15: end -->
<build>
<plugins>
+ <!-- APACHE ISIS customisation 10/15: end -->
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
@@ -1057,6 +879,7 @@
</execution>
</executions>
</plugin>
+ <!-- APACHE ISIS customisation 10/15: end -->
<!-- Create a source-release artifact that contains the fully buildable
project directory source structure. This is the artifact which is
@@ -1079,7 +902,9 @@
<goal>single</goal>
</goals>
<configuration>
- <archiveBaseDirectory>.</archiveBaseDirectory>
+ <!-- APACHE ISIS customisation 11/15: start -->
+ <archiveBaseDirectory>..</archiveBaseDirectory>
+ <!-- APACHE ISIS customisation 11/15: end -->
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<descriptorRefs>
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
@@ -1119,10 +944,12 @@
<goals>
<goal>jar</goal>
</goals>
+ <!-- APACHE ISIS customisation 12/15: start -->
<configuration>
<sourcepath>${delombok.output}</sourcepath>
<doclint>none</doclint>
</configuration>
+ <!-- APACHE ISIS customisation 12/15: end -->
</execution>
</executions>
</plugin>
@@ -1169,25 +996,29 @@
</plugin>
</plugins>
</build>
+ <!-- APACHE ISIS customisation 13/15: start -->
<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>
+ <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>
+ <!-- APACHE ISIS customisation 13/15: end -->
</profile>
-
+ <!-- END SNIPPET: release-profile -->
<profile>
<id>enforce-output-timestamp-property</id>
<activation>
+ <!-- APACHE ISIS customisation 14/15: start -->
<!-- multiple profile activation conditions have AND logic ... -->
<property>
<name>apache-release</name>
</property>
+ <!-- APACHE ISIS customisation 14/15: end -->
<file>
<missing>${basedir}/.maven-apache-parent.marker</missing>
</file>
@@ -1217,7 +1048,8 @@
</plugins>
</build>
</profile>
-
+
+ <!-- APACHE ISIS customisation 15/15: start -->
<profile>
<id>released</id>
<activation>
@@ -1226,17 +1058,43 @@
</property>
</activation>
<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>
+ <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>
- </profiles>
+ <profile>
+ <id>sources</id>
+ <activation>
+ <property>
+ <name>sources</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- APACHE ISIS customisation 15/15: end -->
+ </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 1caf367..ade4130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,91 +14,23 @@
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.
- For more information, see the documentation of this POM: http://maven.apache.org/pom/asf/
- -->
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.2</version>
- <relativePath/>
- </parent>
-
<groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
+ <artifactId>isis-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
+
<packaging>pom</packaging>
- <name>Apache Isis</name>
+ <name>Apache Isis (Aggregator)</name>
<description>
Convenience aggregator POM that references all modules, some explicitely,
others via profiles, that are not activiated per default.
+ The parent POM of the core framework is isis-parent/pom.xml.
</description>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy the aggregator -->
-
- <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_2016.png</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>
- <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
- <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
-
- <java.version>11</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- <maven.compiler.release>11</maven.compiler.release>
-
- <!-- historically was overriding Spring, as v3.0.0 breaks artifact retrieval of org.jruby:jruby (of any version) -->
- <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
-
- <lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
- <delombok.output>${project.build.directory}/delombok</delombok.output>
- <surefire.version>2.22.2</surefire.version>
- <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
-
- <!-- set this property for all derived projects: -->
- <project.build.outputTimestamp>2021-08-22T15:43:00Z</project.build.outputTimestamp>
</properties>
-
- <url>https://isis.apache.org</url>
- <inceptionYear>2010</inceptionYear>
-
- <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>
-
- <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:https://github.com/apache/isis.git</connection>
@@ -107,668 +39,6 @@
<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>
-
- <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>
-
- <!-- breaks dependabot run: timeout due to repo not accessible
- <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>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
- -->
-
- <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>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.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.2.0</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.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</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>3.0.1</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.2.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.2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.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.3.0</version>
- <configuration>
- <notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
- <configuration>
- <pluginManagementExcludes>
- <exclude>org.eclipse.m2e:lifecycle-mapping</exclude>
- </pluginManagementExcludes>
- </configuration>
- </plugin>
- <!-- START SNIPPET: release-plugin-configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M4</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <releaseProfiles>apache-release</releaseProfiles>
- </configuration>
- </plugin>
- <!-- END SNIPPET: release-plugin-configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.12.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.2.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.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
-
- <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>**/*.columnOrder.txt</exclude>
- <exclude>**/*.drawio.svg</exclude>
- <exclude>**/META-INF/spring.factories</exclude>
-
- <exclude>**/incubator/clients/kroviz/package.json.d/project.info</exclude>
-
- <exclude>**/isis/tooling/model4adoc/src/test/resources/org/apache/isis/tooling/adocmodel/test/**</exclude>
-
- <exclude>**/*.iml</exclude>
- <exclude>**/webpack.config.js</exclude>
- <exclude>**/webpack.generated.js</exclude>
- <exclude>**/pnpm-lock.yaml</exclude>
- <exclude>**/pnpmfile.js</exclude>
-
- <exclude>**/*.pdn</exclude>
- <exclude>**/*.svg</exclude>
- <exclude>**/*.rtf</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/.gitkeep</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>**/*.puml</exclude>
- <exclude>**/antora/supplemental-ui/**</exclude>
-
- <exclude>**/xml/objects/**</exclude>
- <exclude>**/test.data</exclude>
- <exclude>**/fixture-data/**</exclude>
- <exclude>**/partials/module-nav.adoc</exclude>
- <exclude>**/partials/extensions.adoc</exclude>
- <exclude>**/partials/component-nav.adoc</exclude>
- <exclude>**/_nav.adoc</exclude>
- <exclude>**/_overview/nav.adoc</exclude>
-
- <exclude>**/src/test/resources/org/apache/isis/subdomains/docx/applib/*.html</exclude>
- <exclude>**/adoc/modules/docx/examples/*.html</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>**/kroviz/webpack.config.d/**</exclude>
-
- <exclude>**/viewer/wicket/ui/components/**/*.css</exclude>
- <exclude>**/viewer/wicket/ui/components/**/*.js</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>**/css/home/scss-files.txt</exclude>
- <exclude>**/css/home/styles.css</exclude>
- <exclude>**/css/site-custom.css</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>
- </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>
-
- <!-- Reference the supplemental-model artifact from module supplemental-model -->
- <supplementalModelArtifacts>
- <supplementalModelArtifact>org.apache.isis:supplemental-model:1.0</supplementalModelArtifact>
- </supplementalModelArtifacts>
-
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-
- <!-- Specify the path, relative to the JAR root, where the supplemental model file is located -->
- <supplementalModels>
- <supplementalModel>supplemental-models.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <projectTimespan>2010~2021</projectTimespan>
- <postDepListText>
- The above (auto-generated) list aggregates the
- dependencies
- (either directly
- or transitively) of all the modules
- that make up ${project.name}.
- You can use
- mvn dependency:list or
- mvn dependency:tree to view dependencies by
- submodule.
-
- ${license.additional-notes}
- </postDepListText>
- </properties>
- </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>${minimalMavenBuildVersion}</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-java-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>${minimalJavaBuildVersion}</version>
- </requireJavaVersion>
- </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.7</version>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <!-- stopped working with GitHub CI on 2021-03-18,
- could not find a way to disable
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- -->
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<!-- ESSENTIAL MODULES -->
@@ -793,6 +63,7 @@
-->
<module>core</module>
<module>extensions</module>
+ <module>isis-parent</module>
<module>mappings</module>
<module>mavendeps</module>
<module>starters</module>
@@ -904,6 +175,7 @@
</modules>
</profile>
+
<profile>
<id>module-examples-demo-vaadin</id>
<activation>
@@ -998,244 +270,6 @@
<module>tooling</module>
</modules>
</profile>
-
- <!-- RELEASE SPECIFIC PROFILES -->
-
- <profile>
- <id>sources</id>
- <activation>
- <property>
- <name>sources</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>deploy</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>apache-release</id>
- <activation>
- <property>
- <name>apache-release</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok-maven-plugin</artifactId>
- <version>1.18.20.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>
-
- <!-- 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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <sourcepath>${delombok.output}</sourcepath>
- <doclint>none</doclint>
- </configuration>
- </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.11</version>
- <executions>
- <execution>
- <id>source-release-checksum</id>
- <goals>
- <goal>artifacts</goal>
- </goals>
- <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 -->
- <phase>post-integration-test</phase>
- <configuration>
- <algorithms>
- <algorithm>SHA-512</algorithm>
- </algorithms>
- <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor -->
- <includeClassifiers>source-release</includeClassifiers>
- <excludeMainArtifact>true</excludeMainArtifact>
- <csvSummary>false</csvSummary>
- <!-- attach SHA-512 checksum as well to upload to Maven Staging Repo,
- as this eases uploading from stage to dist and doesn't do harm in Maven Central -->
- <attachChecksums>true</attachChecksums>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- We want to sign the artifact, the POM, and all attached artifacts (except for SHA-512 checksum) -->
- <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>
- </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>
-
- <profile>
- <id>enforce-output-timestamp-property</id>
- <activation>
- <!-- multiple profile activation conditions have AND logic ... -->
- <property>
- <name>apache-release</name>
- </property>
- <file>
- <missing>${basedir}/.maven-apache-parent.marker</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-output-timestamp-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>project.build.outputTimestamp</property>
- <message>The property "project.build.outputTimestamp" must be set on the reactor's root pom.xml to make the build reproducible. Further information at "https://maven.apache.org/guides/mini/guide-reproducible-builds.html".</message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>released</id>
- <activation>
- <property>
- <name>released</name>
- </property>
- </activation>
- <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>
</profiles>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 0702648..156bd11 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis</groupId>
<artifactId>isis-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../isis-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.tooling</groupId>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index ded1974..38e640f 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -27,8 +27,6 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.ui</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui</git-plugin.propertiesDir>
-
- <enforcer.skip>true</enforcer.skip> <!-- enforcer fails with 'Could not transfer artifact rubygems:cmath:pom:1.0.0 from/to mavengems' -->
</properties>
<dependencies>
diff --git a/valuetypes/prism/vaadin/pom.xml b/valuetypes/prism/vaadin/pom.xml
index fdda6d1..a0ccdb7 100644
--- a/valuetypes/prism/vaadin/pom.xml
+++ b/valuetypes/prism/vaadin/pom.xml
@@ -26,8 +26,6 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.prism.vaadin</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/valuetypes/prism/vaadin</git-plugin.propertiesDir>
-
- <enforcer.skip>true</enforcer.skip> <!-- enforcer detects a lot of issues -->
</properties>
<dependencies>