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 2022/08/20 15:42:18 UTC
[isis] branch master updated (a810ed77c7 -> 5b6f525cc0)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from a810ed77c7 ISIS-2965: adds missing license files.
new e81fd66521 ISIS-2965: adds missing licenses into supplemental-licenses.xml
new 5206dfda83 ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version)
new c65e947e8a ISIS-2965: updates bom/pom.xml project.build.outputTimestamp to fixed value (reproducibility)
new 35bb9fa568 ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (2)
new 8614da2041 ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (3)
new 5b6f525cc0 ISIS-2965: doc updates
The 6 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.
Summary of changes:
.../modules/ROOT/pages/cutting-a-release.adoc | 35 +-
.../components/docs/modules/ROOT/pages/about.adoc | 35 +-
.../landing-page/{libraries.adoc => catalogs.adoc} | 14 +-
.../docs/modules/ROOT/partials/component-nav.adoc | 2 +-
.../module-nav/{libraries.adoc => catalogs.adoc} | 2 -
.../ROOT/partials/module-nav/components.adoc | 4 -
.../ROOT/partials/module-nav/framework.adoc | 20 +-
.../modules/ROOT/partials/module-nav/guides.adoc | 4 +
.../docs/modules/support/partials/module-nav.adoc | 11 +-
.../index/services/bookmark/IdStringifier.adoc | 11 +-
.../index/services/metamodel/DomainModel.adoc | 1 +
.../placeholder/PlaceholderRenderService.adoc | 39 +
.../restfulobjects/applib/JsonRepresentation.adoc | 49 +-
.../valuerender/JsonValueEncoderService.adoc | 51 +
.../modules/ROOT/partials/extensions.adoc | 5 +-
antora/supplemental-ui/index.html | 2 +-
bom/pom.xml | 2452 ++++++++++----------
core/adoc/modules/_overview/pages/about.adoc | 319 +--
extensions/adoc/modules/ROOT/pages/about.adoc | 3 +-
.../executionoutbox/partials/module-nav.adoc | 2 +-
.../adoc/modules/ROOT/partials/extensions.adoc | 1 +
.../adoc/modules/keycloak/partials/module-nav.adoc | 2 +-
.../src/main/resources/supplemental-models.xml | 80 +-
23 files changed, 1558 insertions(+), 1586 deletions(-)
rename antora/components/docs/modules/ROOT/pages/landing-page/{libraries.adoc => catalogs.adoc} (67%)
rename antora/components/docs/modules/ROOT/partials/module-nav/{libraries.adoc => catalogs.adoc} (94%)
create mode 100644 antora/components/refguide-index/modules/applib/pages/index/services/placeholder/PlaceholderRenderService.adoc
create mode 100644 antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/valuerender/JsonValueEncoderService.adoc
[isis] 06/06: ISIS-2965: doc updates
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5b6f525cc03176573c3699ea677e11debf337841
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 16:42:06 2022 +0100
ISIS-2965: doc updates
---
.../modules/ROOT/pages/cutting-a-release.adoc | 35 ++-
.../components/docs/modules/ROOT/pages/about.adoc | 35 +--
.../landing-page/{libraries.adoc => catalogs.adoc} | 14 +-
.../docs/modules/ROOT/partials/component-nav.adoc | 2 +-
.../module-nav/{libraries.adoc => catalogs.adoc} | 2 -
.../ROOT/partials/module-nav/components.adoc | 4 -
.../ROOT/partials/module-nav/framework.adoc | 20 +-
.../modules/ROOT/partials/module-nav/guides.adoc | 4 +
.../docs/modules/support/partials/module-nav.adoc | 11 +-
.../index/services/bookmark/IdStringifier.adoc | 11 +-
.../index/services/metamodel/DomainModel.adoc | 1 +
.../placeholder/PlaceholderRenderService.adoc | 39 +++
.../restfulobjects/applib/JsonRepresentation.adoc | 49 ++--
.../valuerender/JsonValueEncoderService.adoc | 51 ++++
.../modules/ROOT/partials/extensions.adoc | 5 +-
antora/supplemental-ui/index.html | 2 +-
core/adoc/modules/_overview/pages/about.adoc | 319 +++------------------
extensions/adoc/modules/ROOT/pages/about.adoc | 3 +-
.../executionoutbox/partials/module-nav.adoc | 2 +-
.../adoc/modules/ROOT/partials/extensions.adoc | 1 +
.../adoc/modules/keycloak/partials/module-nav.adoc | 2 +-
21 files changed, 245 insertions(+), 367 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 368123cdf4..2265bb3ace 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -70,10 +70,9 @@ To run the RAT tool, use:
[source,bash,subs="attributes+"]
.find unapproved/missing licenses
----
-mvn clean
-
pushd bom
-mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=1000 -Dreleased
+mvn -Dapache-release clean
+mvn -Dapache-release org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=1000
popd
for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done > /tmp/rat-qn.txt
@@ -105,18 +104,40 @@ This is stored in the `src/main/appended-resources/supplemental-models.xml` file
It's first necessary to have built the framework locally at least once.
-In the root directory:
+* switch to the `bom` directory:
++
+[source,bash,subs="attributes+"]
+----
+pushd bom
+----
+* build the framework (ok to skip tests):
++
[source,bash,subs="attributes+"]
----
-mvn clean install -o -DskipTests
+mvn -Dgithub clean install -DskipTests
----
++
+NB: the `-Dgithub` activates the "github" profile which references the exact same ``<module>``s as the official "apache-release" profile.
-Once this is done, capture the missing license information using:
+* Capture the missing license information using:
++
+[source,bash,subs="attributes+"]
+----
+mvn -Dgithub license:download-licenses
+----
+* Switch back to the root directory:
++
+[source,bash,subs="attributes+"]
+----
+popd
+----
+
+* Report on the missing license information using:
++
[source,bash,subs="attributes+"]
----
-mvn license:download-licenses
groovy scripts/checkmissinglicenses.groovy
----
diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index 0504cef1d0..58726904dc 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -66,8 +66,6 @@ _Core_
_Process_
* xref:conguide:ROOT:about.adoc[Contributors' Guide]
-* *xref:comguide:ROOT:about.adoc[Committers' Guide]*
-** xref:tooling:ROOT:about.adoc[Tooling]
|
[discrete]
@@ -90,9 +88,9 @@ _Security_
|
[discrete]
-== Libraries
+== Catalogs
-_For Use in Apps_
+_For Use in Domain Apps_
* xref:valuetypes:ROOT:about.adoc[Value Type Catalog]
@@ -117,31 +115,36 @@ _Releases_
* xref:docs:ROOT:downloads/how-to.adoc[Downloads]
* xref:relnotes:ROOT:about.adoc[Release Notes]
-_Nightly Builds (not ASF)_
+_Nightly Builds_
-* link:https://github.com/apache-isis-committers/isis-nightly[CI]
-* link:https://nexus.incode.work/[Maven Repo] (current)
-* link:https://repo.incode.cloud/[Maven Repo] (v1 only)
-* link:https://apache-isis-committers.github.io/isis-nightly[Website preview]
+* link:https://github.com/apache/isis[Packages] (ASF hosted)
+* link:https://github.com/apache-isis-committers/isis-nightly[Packages] (not ASF hosted)
+* link:https://apache-isis-committers.github.io/isis-nightly[Website preview] (not ASF hosted)
|
[discrete]
== Framework
-_Design_
+_Process_
+
+* *xref:comguide:ROOT:about.adoc[Committers' Guide]*
+* xref:tooling:ROOT:about.adoc[Tooling]
+
+_Automated Analysis_
-* xref:core:ROOT:about.adoc[Core Framework]
-** xref:core:_overview:about.adoc[System Overview]
+* link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
+* link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
_In Development_
-* xref:incubator:ROOT:about.adoc[Incubator]
+* xref:incubator:ROOT:about.adoc[Incubator]
-_Analysis_
-* link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
-* link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
+_Other_
+
+* xref:core:_overview:about.adoc[System Overview] (generated)
+* xref:core:ROOT:about.adoc[Design Docs] (out of date)
_Thanks_
diff --git a/antora/components/docs/modules/ROOT/pages/landing-page/libraries.adoc b/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
similarity index 67%
rename from antora/components/docs/modules/ROOT/pages/landing-page/libraries.adoc
rename to antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
index f66c0b3950..eeccc901e7 100644
--- a/antora/components/docs/modules/ROOT/pages/landing-page/libraries.adoc
+++ b/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
@@ -1,18 +1,22 @@
-= Libraries
+= Catalogs
:Notice: 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 ag [...]
-Included with the framework are two catalogues of libraries:
+The framework includes two catalogs:
* xref:valuetypes:ROOT:about.adoc[Value Type Catalog]
+
-Implementations of various value types, eg Markdown.
+The modules in this catalog provide implementations of various value types, for example Markdown.
+They are intended to be consumed by your application.
+
Each will have an applib submodule (for use within the domain logic) as well as various extension modules to be made available to the framework itself (to teach it how to persist or render the value type).
* xref:extensions:ROOT:about.adoc[Extensions Catalog]
+
-Describes a number of extensions to the various components that make up the framework.
-+
+These modules in this catalog extend the capabilities of the framework itself.
+They are generally not consumed directly by your application.
For example, the "Excel Download" extension allows collections to be downloaded as an Excel `.xlsx` spreadsheet in the Wicket viewer.
++
+That said, some extensions do also provide an applib.
+For example the gmap3 extension provides an applib so that domain objects can expose their location (typically a Java interface to be implemented); this allows the extension to plot them on a map.
diff --git a/antora/components/docs/modules/ROOT/partials/component-nav.adoc b/antora/components/docs/modules/ROOT/partials/component-nav.adoc
index 091b8b419d..315c87f16d 100644
--- a/antora/components/docs/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/docs/modules/ROOT/partials/component-nav.adoc
@@ -4,7 +4,7 @@ include::docs:ROOT:partial$module-nav/demos-and-tutorials.adoc[]
include::docs:ROOT:partial$module-nav/resources.adoc[]
include::docs:ROOT:partial$module-nav/guides.adoc[]
include::docs:ROOT:partial$module-nav/components.adoc[]
-include::docs:ROOT:partial$module-nav/libraries.adoc[]
+include::docs:ROOT:partial$module-nav/catalogs.adoc[]
include::docs:support:partial$module-nav.adoc[]
include::docs:ROOT:partial$module-nav/framework.adoc[]
include::docs:ROOT:partial$module-nav/further-resources.adoc[]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/libraries.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
similarity index 94%
rename from antora/components/docs/modules/ROOT/partials/module-nav/libraries.adoc
rename to antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
index 9834294ec8..4fd3b612f8 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/libraries.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
@@ -6,5 +6,3 @@
** xref:valuetypes:ROOT:about.adoc[Value Type Catalog]
** xref:extensions:ROOT:about.adoc[Extensions Catalog]
-** Other
-*** xref:incubator:ROOT:about.adoc[Incubator]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
index b86aa7bc97..7801cfe299 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
@@ -3,10 +3,6 @@
* Components
-** Overview
-
-*** xref:core:_overview:about.adoc[System Overview]
-
** Viewers
*** xref:vw:ROOT:about.adoc[Web UI (Wicket)]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/framework.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/framework.adoc
index 8cbcdccb29..c756fb5ea8 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/framework.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/framework.adoc
@@ -4,21 +4,21 @@
* Framework
+
** Process
-*** xref:conguide:ROOT:about.adoc[Contributors' Guide]
*** xref:comguide:ROOT:about.adoc[Committers' Guide]
-**** xref:tooling:ROOT:about.adoc[Tooling]
+*** xref:tooling:ROOT:about.adoc[Tooling]
-** Design
+** Automated Analysis
+*** link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
+*** link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
-*** xref:core:ROOT:about.adoc[Core Framework]
-**** xref:core:_overview:about.adoc[System Overview]
+** xref:incubator:ROOT:about.adoc[Incubator]
+** Other
-** Analysis
-*** link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
-*** link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
+*** xref:core:_overview:about.adoc[System Overview] (generated)
+*** xref:core:ROOT:about.adoc[Design Docs] (out of date)
-** Thanks
-*** xref:more-thanks/more-thanks.adoc[Acknowledgements]
+** xref:more-thanks/more-thanks.adoc[Acknowledgements]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
index e3f7d2415a..2518eea6cd 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
@@ -12,3 +12,7 @@
*** xref:userguide:ROOT:about.adoc[User Guide]
*** xref:refguide:ROOT:about.adoc[Reference Guide]
*** xref:testing:ROOT:about.adoc[Testing Guide]
+
+** Process
+*** xref:conguide:ROOT:about.adoc[Contributors' Guide]
+
diff --git a/antora/components/docs/modules/support/partials/module-nav.adoc b/antora/components/docs/modules/support/partials/module-nav.adoc
index 2b5f49301d..fba0b0137d 100644
--- a/antora/components/docs/modules/support/partials/module-nav.adoc
+++ b/antora/components/docs/modules/support/partials/module-nav.adoc
@@ -1,7 +1,5 @@
-
-
* Support
** Contact
@@ -17,10 +15,9 @@
*** xref:relnotes:ROOT:about.adoc[Release Notes]
-** Nightly Builds (not ASF)
+** Nightly Builds
-*** link:https://github.com/apache-isis-committers/isis-nightly[CI]
-*** link:https://nexus.incode.work/[Maven repo] (current)
-*** link:https://repo.incode.cloud/[Maven repo] (v1 only)
-*** link:https://apache-isis-committers.github.io/isis-nightly[Website preview]
+*** link:https://github.com/apache/isis[Packages] (ASF hosted)
+*** link:https://github.com/apache-isis-committers/isis-nightly[Packages] (not ASF hosted)
+*** link:https://apache-isis-committers.github.io/isis-nightly[Website preview] (not ASF hosted)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/IdStringifier.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/IdStringifier.adoc
index d68261a7a1..c6a6e10934 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/IdStringifier.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/IdStringifier.adoc
@@ -5,7 +5,7 @@ SPI to convert the identifier (primary key) of an entity, of a given type (eg In
This is ultimately used by xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[BookmarkService] where we hold a persistent reference to an entity. The resultant string also appears in URLs of the Wicket viewer and Restful Objects viewers, and in mementos eg in _org.apache.isis.schema.cmd.v2.CommandDto_ and _org.apache.isis.schema.ixn.v2.InteractionDto_ .
-The framework provides default implementations of this SPI for JDO (data store and application identity) and for JPA. Because this is an SPI, other modules or application code can provide their own implementations. An example of such is the JPA implementation of the `commandlog` extension.
+The framework provides default implementations of this SPI for JDO (data store and application identity) and for JPA. Because this is a SPI, other modules or application code can provide their own implementations. An example of such is the JPA implementation of the `commandlog` extension.
== API
@@ -13,9 +13,10 @@ The framework provides default implementations of this SPI for JDO (data store a
.IdStringifier.java
----
interface IdStringifier<T> {
+ public final static char SEPARATOR;
Class<T> getCorrespondingClass()
String enstring(T value) // <.>
- T destring(String stringified) // <.>
+ T destring(Class<?> targetEntityClass, String stringified) // <.>
}
----
@@ -24,7 +25,7 @@ interface IdStringifier<T> {
--
Convert the value (which will be of the same type as returned by _#getCorrespondingClass()_ into a string representation.
--
-<.> xref:#destring_String[destring(String)]
+<.> xref:#destring_Class_String[destring(Class, String)]
+
--
Convert a string representation of the identifier (as returned by _#enstring(Object)_ ) into an object that can be used to retrieve.
@@ -37,7 +38,7 @@ Convert a string representation of the identifier (as returned by _#enstring(Obj
Convert the value (which will be of the same type as returned by _#getCorrespondingClass()_ into a string representation.
-[#destring_String]
-=== destring(String)
+[#destring_Class_String]
+=== destring(Class, String)
Convert a string representation of the identifier (as returned by _#enstring(Object)_ ) into an object that can be used to retrieve.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/DomainModel.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/DomainModel.adoc
index cd12a57cd9..22a6ad2a7e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/DomainModel.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/DomainModel.adoc
@@ -8,6 +8,7 @@
----
interface DomainModel {
List<DomainMember> getDomainMembers()
+ void forEachLogicalType(BiConsumer<? super String, ? super List<DomainMember>> consumer)
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/placeholder/PlaceholderRenderService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/placeholder/PlaceholderRenderService.adoc
new file mode 100644
index 0000000000..6ff77e1938
--- /dev/null
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/placeholder/PlaceholderRenderService.adoc
@@ -0,0 +1,39 @@
+= PlaceholderRenderService
+:Notice: 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 ag [...]
+
+Service that renders various _PlaceholderLiteral_ s, as presented with the UI.
+
+== API
+
+[source,java]
+.PlaceholderRenderService.java
+----
+interface PlaceholderRenderService {
+ String asText(PlaceholderLiteral placeholderLiteral) // <.>
+ String asHtml(PlaceholderLiteral placeholderLiteral) // <.>
+ PlaceholderRenderService fallback()
+}
+----
+
+<.> xref:#asText_PlaceholderLiteral[asText(PlaceholderLiteral)]
++
+--
+Textual representation of given _PlaceholderLiteral_ , as used for eg. titles and choice drop-downs.
+--
+<.> xref:#asHtml_PlaceholderLiteral[asHtml(PlaceholderLiteral)]
++
+--
+Html representation of given _PlaceholderLiteral_ , as used for rendering with the UI (when appropriate).
+--
+
+== Members
+
+[#asText_PlaceholderLiteral]
+=== asText(PlaceholderLiteral)
+
+Textual representation of given _PlaceholderLiteral_ , as used for eg. titles and choice drop-downs.
+
+[#asHtml_PlaceholderLiteral]
+=== asHtml(PlaceholderLiteral)
+
+Html representation of given _PlaceholderLiteral_ , as used for rendering with the UI (when appropriate).
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
index 78ac08f9a8..52f1c61310 100644
--- a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
@@ -13,6 +13,7 @@ class JsonRepresentation {
public static final DateTimeFormatter yyyyMMddTHHmmssZ;
public static final DateTimeFormatter _HHmmss;
JsonRepresentation(JsonNode jsonNode)
+ JsonRepresentation jsonAsMap(String keyValuePairsAsJson)
JsonRepresentation newMap(String... keyValuePairs)
JsonRepresentation newArray()
JsonRepresentation newArray(int initialSize)
@@ -110,29 +111,31 @@ class JsonRepresentation {
boolean mapHas(String key)
JsonRepresentation mapPut(String key, List<Object> value)
JsonRepresentation mapPut(String key, Object value)
- JsonRepresentation mapPut(String key, JsonRepresentation value)
- JsonRepresentation mapPut(String key, String value)
- JsonRepresentation mapPut(String key, JsonNode value)
- JsonRepresentation mapPut(String key, byte value)
- JsonRepresentation mapPut(String key, Byte value)
- JsonRepresentation mapPut(String key, short value)
- JsonRepresentation mapPut(String key, Short value)
- JsonRepresentation mapPut(String key, int value)
- JsonRepresentation mapPut(String key, Integer value)
- JsonRepresentation mapPut(String key, long value)
- JsonRepresentation mapPut(String key, Long value)
- JsonRepresentation mapPut(String key, float value)
- JsonRepresentation mapPut(String key, Float value)
- JsonRepresentation mapPut(String key, double value)
- JsonRepresentation mapPut(String key, Double value)
- JsonRepresentation mapPut(String key, boolean value)
- JsonRepresentation mapPut(String key, Boolean value)
- JsonRepresentation mapPut(String key, char value)
- JsonRepresentation mapPut(String key, Character value)
- JsonRepresentation mapPut(String key, BigInteger value)
- JsonRepresentation mapPut(Iterable<Entry<String, JsonRepresentation>> entries)
- JsonRepresentation mapPut(Entry<String, JsonRepresentation> entry)
- JsonRepresentation mapPut(String key, BigDecimal value)
+ JsonRepresentation mapPutJsonRepresentation(String key, JsonRepresentation value)
+ JsonRepresentation mapPutString(String key, String value)
+ JsonRepresentation mapPutJsonNode(String key, JsonNode value)
+ JsonRepresentation mapPutByte(String key, byte value)
+ JsonRepresentation mapPutByteNullable(String key, Byte value)
+ JsonRepresentation mapPutShort(String key, short value)
+ JsonRepresentation mapPutShortNullable(String key, Short value)
+ JsonRepresentation mapPutInt(String key, int value)
+ JsonRepresentation mapPutIntNullable(String key, Integer value)
+ JsonRepresentation mapPutLong(String key, long value)
+ JsonRepresentation mapPutLongNullable(String key, Long value)
+ JsonRepresentation mapPutFloat(String key, float value)
+ JsonRepresentation mapPutFloatNullable(String key, Float value)
+ JsonRepresentation mapPutDouble(String key, double value)
+ JsonRepresentation mapPutDoubleNullable(String key, Double value)
+ JsonRepresentation mapPutBoolean(String key, boolean value)
+ JsonRepresentation mapPutBooleanNullable(String key, Boolean value)
+ JsonRepresentation mapPutChar(String key, char value)
+ JsonRepresentation mapPutCharNullable(String key, Character value)
+ JsonRepresentation mapPutBigInteger(String key, BigInteger value)
+ JsonRepresentation mapPutEntries(Iterable<Entry<String, JsonRepresentation>> entries)
+ JsonRepresentation mapPutEntry(Entry<String, JsonRepresentation> entry)
+ JsonRepresentation mapPutBigDecimal(String key, BigDecimal value)
+ JsonRepresentation putFormat(String format)
+ JsonRepresentation putExtendedFormat(String format)
Stream<Map.Entry<String, JsonRepresentation>> streamMapEntries()
JsonRepresentation ensureArray() // <.>
int hashCode()
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/valuerender/JsonValueEncoderService.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/valuerender/JsonValueEncoderService.adoc
new file mode 100644
index 0000000000..65b40681fe
--- /dev/null
+++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/valuerender/JsonValueEncoderService.adoc
@@ -0,0 +1,51 @@
+= JsonValueEncoderService
+:Notice: 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 ag [...]
+
+Converts value representing _ManagedObject_ s to their corresponding JSON representation and back.
+
+== API
+
+[source,java]
+.JsonValueEncoderService.java
+----
+interface JsonValueEncoderService {
+ ManagedObject asAdapter(ObjectSpecification valueSpec, JsonRepresentation valueRepr, JsonValueConverter.Context context) // <.>
+ void appendValueAndFormat(ManagedObject valueAdapter, JsonRepresentation repr, JsonValueConverter.Context context) // <.>
+ Object asObject(ManagedObject adapter, JsonValueConverter.Context context) // <.>
+ NullNode appendNullAndFormat(JsonRepresentation repr, boolean suppressExtensions)
+ void appendFormats(JsonRepresentation repr, String format, String extendedFormat, boolean suppressExtensions)
+}
+----
+
+<.> xref:#asAdapter_ObjectSpecification_JsonRepresentation_JsonValueConverter_Context[asAdapter(ObjectSpecification, JsonRepresentation, JsonValueConverter_Context)]
++
+--
+The value recovered from xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] as _ManagedObject_ honoring _Context_ , otherwise `null` .
+--
+<.> xref:#appendValueAndFormat_ManagedObject_JsonRepresentation_JsonValueConverter_Context[appendValueAndFormat(ManagedObject, JsonRepresentation, JsonValueConverter_Context)]
++
+--
+Appends given value type representing _ManagedObject_ to given xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] honoring _Context_ .
+--
+<.> xref:#asObject_ManagedObject_JsonValueConverter_Context[asObject(ManagedObject, JsonValueConverter_Context)]
++
+--
+A _JsonNode_ or otherwise natively supported simple type from given _ManagedObject_ , honoring _Context_ .
+--
+
+== Members
+
+[#asAdapter_ObjectSpecification_JsonRepresentation_JsonValueConverter_Context]
+=== asAdapter(ObjectSpecification, JsonRepresentation, JsonValueConverter_Context)
+
+The value recovered from xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] as _ManagedObject_ honoring _Context_ , otherwise `null` .
+
+[#appendValueAndFormat_ManagedObject_JsonRepresentation_JsonValueConverter_Context]
+=== appendValueAndFormat(ManagedObject, JsonRepresentation, JsonValueConverter_Context)
+
+Appends given value type representing _ManagedObject_ to given xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] honoring _Context_ .
+
+[#asObject_ManagedObject_JsonValueConverter_Context]
+=== asObject(ManagedObject, JsonValueConverter_Context)
+
+A _JsonNode_ or otherwise natively supported simple type from given _ManagedObject_ , honoring _Context_ .
diff --git a/antora/components/userguide/modules/ROOT/partials/extensions.adoc b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
index a76656279b..26a86515d6 100644
--- a/antora/components/userguide/modules/ROOT/partials/extensions.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
@@ -1,7 +1,8 @@
include::userguide:excel:partial$module-nav.adoc[]
include::userguide:commandlog:partial$module-nav.adoc[]
-// commandreplay moved to incubator for the time being
-//include::userguide:commandreplay:partial$module-nav.adoc[]
+include::userguide:executionlog:partial$module-nav.adoc[]
+include::userguide:executionoutbox:partial$module-nav.adoc[]
+include::userguide:executionrepublisher:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
include::userguide:quartz:partial$module-nav.adoc[]
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index 6956e3a9e9..8eb2ffcfd6 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -121,7 +121,7 @@
<li><a href="docs/latest/starters/about.html">Starter Apps</a></li>
<li><a href="docs/latest/landing-page/guides.html">Guides</a></li>
<li><a href="docs/latest/landing-page/components.html">Components</a></li>
- <li><a href="docs/latest/landing-page/libraries.html">Libraries</a></li>
+ <li><a href="docs/latest/landing-page/catalogs.html">Catalogs</a></li>
<li><a href="docs/latest/landing-page/releases.html">Releases</a></li>
</ul>
</li>
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 2f7ef511b0..2a65ebb05d 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -728,244 +728,7 @@ Artifact: demo-domain
Type: jar
Directory: /examples/demo/domain
----
-|.Components
-****
-demoapp.dom.AppConfiguration +
-demoapp.dom._infra.DefaultTitleProvider +
-demoapp.dom._infra.LibraryPreloadingService +
-demoapp.dom._infra.resources.AsciiDocConverterService +
-demoapp.dom._infra.resources.AsciiDocReaderService +
-demoapp.dom._infra.resources.AsciiDocValueSemanticsWithPreprocessing +
-demoapp.dom._infra.resources.MarkdownReaderService +
-demoapp.dom._infra.resources.MarkupReaderService +
-demoapp.dom._infra.resources.MarkupVariableResolverService +
-demoapp.dom._infra.resources.ResourceReaderService +
-demoapp.dom._infra.samples.NameSamples +
-demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory +
-demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory +
-demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault +
-demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory +
-demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingSeeding +
-demoapp.dom.domain.actions.Action.commandPublishing.jdo.ActionCommandPublishingJdoEntities +
-demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpaEntities +
-demoapp.dom.domain.actions.Action.domainEvent.subscribers.ActionDomainEventControlService +
-demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingSeeding +
-demoapp.dom.domain.actions.Action.executionPublishing.jdo.ActionExecutionPublishingJdoEntities +
-demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpaEntities +
-demoapp.dom.domain.collections.Collection.domainEvent.subscribers.CollectionDomainEventControlService +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledSeeding +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jdo.DomainObjectEntityChangePublishingDisabledJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jpa.DomainObjectEntityChangePublishingDisabledJpaEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledSeeding +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jdo.DomainObjectEntityChangePublishingEnabledJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jpa.DomainObjectEntityChangePublishingEnabledJpaEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedSeeding +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpaEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenSeeding +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpaEntities +
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefSeeding +
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jdo.JaxbRefJdoEntities +
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jpa.JaxbRefJpaEntities +
-demoapp.dom.domain.objects.other.embedded.jdo.ComplexNumberJdoValueSemantics +
-demoapp.dom.domain.objects.other.embedded.jdo.NumberConstantJdoRepository +
-demoapp.dom.domain.objects.other.embedded.jpa.ComplexNumberJpaValueSemantics +
-demoapp.dom.domain.objects.other.embedded.jpa.NumberConstantJpaRepository +
-demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantSeeding +
-demoapp.dom.domain.objects.other.embedded.samples.ComplexNumberSamples +
-demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingSeeding +
-demoapp.dom.domain.properties.Property.commandPublishing.jdo.PropertyCommandPublishingJdoEntities +
-demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpaEntities +
-demoapp.dom.domain.properties.Property.domainEvent.subscribers.PropertyDomainEventControlService +
-demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingSeeding +
-demoapp.dom.domain.properties.Property.executionPublishing.jdo.PropertyExecutionPublishingJdoEntities +
-demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpaEntities +
-demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities +
-demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpaEntities +
-demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildSeeding +
-demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService +
-demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback +
-demoapp.dom.featured.customui.geocoding.GeoapifyClient +
-demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation +
-demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository +
-demoapp.dom.services.core.eventbusservice.EventLogEntryJpaRepository +
-demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation +
-demoapp.dom.services.core.wrapperFactory.WrapperFactorySeeding +
-demoapp.dom.services.core.wrapperFactory.jdo.WrapperFactoryJdoEntities +
-demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpaEntities +
-demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo +
-demoapp.dom.services.extensions.secman.apptenancy.jdo.TenantedJdoEntities +
-demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpaEntities +
-demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedSeeding +
-demoapp.dom.services.extensions.secman.appuser.seed.AppUserSeeding +
-demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities +
-demoapp.dom.types.isis.blobs.jpa.IsisBlobJpaEntities +
-demoapp.dom.types.isis.blobs.persistence.IsisBlobSeeding +
-demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples +
-demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities +
-demoapp.dom.types.isis.clobs.jpa.IsisClobJpaEntities +
-demoapp.dom.types.isis.clobs.persistence.IsisClobSeeding +
-demoapp.dom.types.isis.clobs.samples.IsisClobsSamples +
-demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities +
-demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpaEntities +
-demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathSeeding +
-demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples +
-demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities +
-demoapp.dom.types.isis.markups.jpa.IsisMarkupJpaEntities +
-demoapp.dom.types.isis.markups.persistence.IsisMarkupSeeding +
-demoapp.dom.types.isis.markups.samples.IsisMarkupSamples +
-demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities +
-demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpaEntities +
-demoapp.dom.types.isis.passwords.persistence.IsisPasswordSeeding +
-demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples +
-demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities +
-demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpaEntities +
-demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocSeeding +
-demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples +
-demoapp.dom.types.isisext.cal.jdo.IsisCalendarEventEntities +
-demoapp.dom.types.isisext.cal.jpa.IsisCalendarEventEntities +
-demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventSeeding +
-demoapp.dom.types.isisext.cal.samples.IsisCalendarEventSamples +
-demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities +
-demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpaEntities +
-demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownSeeding +
-demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples +
-demoapp.dom.types.javaawt.images.jdo.JavaAwtBufferedImageJdoEntities +
-demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpaEntities +
-demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageSeeding +
-demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImageService +
-demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImagesSamples +
-demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities +
-demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpaEntities +
-demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanSeeding +
-demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples +
-demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities +
-demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpaEntities +
-demoapp.dom.types.javalang.bytes.persistence.WrapperByteSeeding +
-demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples +
-demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities +
-demoapp.dom.types.javalang.characters.jpa.WrapperCharacterJpaEntities +
-demoapp.dom.types.javalang.characters.persistence.WrapperCharacterSeeding +
-demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples +
-demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities +
-demoapp.dom.types.javalang.doubles.jpa.WrapperDoubleJpaEntities +
-demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleSeeding +
-demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples +
-demoapp.dom.types.javalang.enums.jdo.JavaLangEnumJdoEntities +
-demoapp.dom.types.javalang.enums.jpa.JavaLangEnumJpaEntities +
-demoapp.dom.types.javalang.enums.persistence.JavaLangEnumSeeding +
-demoapp.dom.types.javalang.enums.samples.JavaLangEnumSamples +
-demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities +
-demoapp.dom.types.javalang.floats.jpa.WrapperFloatJpaEntities +
-demoapp.dom.types.javalang.floats.persistence.WrapperFloatSeeding +
-demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples +
-demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities +
-demoapp.dom.types.javalang.integers.jpa.WrapperIntegerJpaEntities +
-demoapp.dom.types.javalang.integers.persistence.WrapperIntegerSeeding +
-demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples +
-demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities +
-demoapp.dom.types.javalang.longs.jpa.WrapperLongJpaEntities +
-demoapp.dom.types.javalang.longs.persistence.WrapperLongSeeding +
-demoapp.dom.types.javalang.longs.samples.WrapperLongSamples +
-demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities +
-demoapp.dom.types.javalang.shorts.jpa.WrapperShortJpaEntities +
-demoapp.dom.types.javalang.shorts.persistence.WrapperShortSeeding +
-demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples +
-demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities +
-demoapp.dom.types.javalang.strings.jpa.JavaLangStringJpaEntities +
-demoapp.dom.types.javalang.strings.persistence.JavaLangStringSeeding +
-demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities +
-demoapp.dom.types.javamath.bigdecimals.jpa.JavaMathBigDecimalJpaEntities +
-demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalSeeding +
-demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples +
-demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities +
-demoapp.dom.types.javamath.bigintegers.jpa.JavaMathBigIntegerJpaEntities +
-demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerSeeding +
-demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples +
-demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities +
-demoapp.dom.types.javanet.urls.jpa.JavaNetUrlJpaEntities +
-demoapp.dom.types.javanet.urls.persistence.JavaNetUrlSeeding +
-demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples +
-demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities +
-demoapp.dom.types.javasql.javasqldate.jpa.JavaSqlDateJpaEntities +
-demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateSeeding +
-demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples +
-demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities +
-demoapp.dom.types.javasql.javasqltimestamp.jpa.JavaSqlTimestampJpaEntities +
-demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampSeeding +
-demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples +
-demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities +
-demoapp.dom.types.javatime.javatimelocaldate.jpa.JavaTimeLocalDateJpaEntities +
-demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateSeeding +
-demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples +
-demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimelocaldatetime.jpa.JavaTimeLocalDateTimeJpaEntities +
-demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeSeeding +
-demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples +
-demoapp.dom.types.javatime.javatimelocaltime.jdo.JavaTimeLocalTimeJdoEntities +
-demoapp.dom.types.javatime.javatimelocaltime.jpa.JavaTimeLocalTimeJpaEntities +
-demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeSeeding +
-demoapp.dom.types.javatime.javatimelocaltime.samples.JavaTimeLocalTimeSamples +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jpa.JavaTimeOffsetDateTimeJpaEntities +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeSeeding +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples +
-demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities +
-demoapp.dom.types.javatime.javatimeoffsettime.jpa.JavaTimeOffsetTimeJpaEntities +
-demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeSeeding +
-demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples +
-demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimezoneddatetime.jpa.JavaTimeZonedDateTimeJpaEntities +
-demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeSeeding +
-demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples +
-demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities +
-demoapp.dom.types.javautil.javautildate.jpa.JavaUtilDateJpaEntities +
-demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateSeeding +
-demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples +
-demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities +
-demoapp.dom.types.javautil.uuids.jpa.JavaUtilUuidJpaEntities +
-demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidSeeding +
-demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples +
-demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities +
-demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeJdoSeeding +
-demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples +
-demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities +
-demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateJdoSeeding +
-demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples +
-demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities +
-demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeSeeding +
-demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples +
-demoapp.dom.types.jodatime.jodalocaltime.jdo.JodaLocalTimeJdoEntities +
-demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeSeeding +
-demoapp.dom.types.jodatime.jodalocaltime.samples.JodaLocalTimeSamples +
-demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities +
-demoapp.dom.types.primitive.booleans.jpa.PrimitiveBooleanJpaEntities +
-demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanSeeding +
-demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities +
-demoapp.dom.types.primitive.bytes.jpa.PrimitiveByteJpaEntities +
-demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteSeeding +
-demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities +
-demoapp.dom.types.primitive.chars.jpa.PrimitiveCharJpaEntities +
-demoapp.dom.types.primitive.chars.persistence.PrimitiveCharSeeding +
-demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities +
-demoapp.dom.types.primitive.doubles.jpa.PrimitiveDoubleJpaEntities +
-demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleSeeding +
-demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities +
-demoapp.dom.types.primitive.floats.jpa.PrimitiveFloatJpaEntities +
-demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatSeeding +
-demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities +
-demoapp.dom.types.primitive.ints.jpa.PrimitiveIntJpaEntities +
-demoapp.dom.types.primitive.ints.persistence.PrimitiveIntSeeding +
-demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities +
-demoapp.dom.types.primitive.longs.jpa.PrimitiveLongJpaEntities +
-demoapp.dom.types.primitive.longs.persistence.PrimitiveLongSeeding +
-demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities +
-demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpaEntities +
-demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortSeeding +
-****
-
-.Dependencies
+|.Dependencies
****
com.h2database:h2:jar:<managed> +
org.apache.isis.extensions:isis-extensions-audittrail-persistence-jdo:jar:<managed> +
@@ -1051,12 +814,7 @@ Artifact: demo-web
Type: jar
Directory: /examples/demo/web
----
-|.Components
-****
-demoapp.web._infra.utils.ThereCanBeOnlyOne +
-****
-
-.Dependencies
+|.Dependencies
****
org.apache.isis.examples.apps:demo-domain:jar:<managed> +
org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
@@ -1074,12 +832,7 @@ Artifact: demo-wicket-common
Type: jar
Directory: /examples/demo/wicket/common
----
-|.Components
-****
-demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory +
-****
-
-.Dependencies
+|.Dependencies
****
org.apache.isis.examples.apps:demo-web:jar:${project.version} +
org.apache.isis.extensions:isis-extensions-fullcalendar-wicket-ui:jar:<managed> +
@@ -1484,7 +1237,7 @@ org.jmock:jmock:jar:<managed> +
.Document Index Entries
****
-xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/IsisModuleApplibChangeAndExecutionLoggers.adoc[IsisModuleApplibChangeAndExecutionLoggers], xref:refguide:applib:index/IsisModuleApplibMixins.adoc[IsisModuleApplibMixins], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[A [...]
+xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/IsisModuleApplibChangeAndExecutionLoggers.adoc[IsisModuleApplibChangeAndExecutionLoggers], xref:refguide:applib:index/IsisModuleApplibMixins.adoc[IsisModuleApplibMixins], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[A [...]
****
|Apache Isis Core - Code Gen (ByteBuddy)
@@ -1647,6 +1400,7 @@ o.a.i.core.metamodel.valuesemantics.ClobValueSemantics +
o.a.i.core.metamodel.valuesemantics.CommandDtoValueSemantics +
o.a.i.core.metamodel.valuesemantics.DoubleValueSemantics +
o.a.i.core.metamodel.valuesemantics.FloatValueSemantics +
+o.a.i.core.metamodel.valuesemantics.IdStringifierForSerializable +
o.a.i.core.metamodel.valuesemantics.IntValueSemantics +
o.a.i.core.metamodel.valuesemantics.InteractionDtoValueSemantics +
o.a.i.core.metamodel.valuesemantics.LocalResourcePathValueSemantics +
@@ -1655,7 +1409,6 @@ o.a.i.core.metamodel.valuesemantics.LongValueSemantics +
o.a.i.core.metamodel.valuesemantics.MarkupValueSemantics +
o.a.i.core.metamodel.valuesemantics.OidDtoValueSemantics +
o.a.i.core.metamodel.valuesemantics.PasswordValueSemantics +
-o.a.i.core.metamodel.valuesemantics.SerializableValueSemantics +
o.a.i.core.metamodel.valuesemantics.ShortValueSemantics +
o.a.i.core.metamodel.valuesemantics.StringValueSemantics +
o.a.i.core.metamodel.valuesemantics.TreeNodeValueSemantics +
@@ -1746,6 +1499,7 @@ o.a.i.core.runtimeservices.memento.ObjectMementoServiceDefault +
o.a.i.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault +
o.a.i.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS +
o.a.i.core.runtimeservices.message.MessageServiceDefault +
+o.a.i.core.runtimeservices.placeholder.PlaceholderRenderServiceDefault +
o.a.i.core.runtimeservices.publish.CommandPublisherDefault +
o.a.i.core.runtimeservices.publish.EntityChangesPublisherDefault +
o.a.i.core.runtimeservices.publish.EntityPropertyChangePublisherDefault +
@@ -2934,7 +2688,6 @@ Directory: /viewers/restfulobjects/rendering
----
|.Components
****
-o.a.i.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder +
o.a.i.viewer.restfulobjects.rendering.service.RepresentationService +
o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest +
o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest$RequestFilter +
@@ -2948,6 +2701,7 @@ o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefa
o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator +
o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault +
o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault +
+o.a.i.viewer.restfulobjects.rendering.service.valuerender.JsonValueEncoderServiceDefault +
****
.Dependencies
@@ -2959,7 +2713,7 @@ org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
.Document Index Entries
****
-xref:refguide:viewer:index/restfulobjects/rendering/IResourceContext.adoc[IResourceContext], xref:refguide:viewer:index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc[IsisModuleRestfulObjectsRendering], xref:refguide:viewer:index/restfulobjects/rendering/service/RepresentationService.adoc[RepresentationService], xref:refguide:viewer:index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc[AcceptHeaderServiceForRest], xref:refguide:viewer:index/ [...]
+xref:refguide:viewer:index/restfulobjects/rendering/IResourceContext.adoc[IResourceContext], xref:refguide:viewer:index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc[IsisModuleRestfulObjectsRendering], xref:refguide:viewer:index/restfulobjects/rendering/service/RepresentationService.adoc[RepresentationService], xref:refguide:viewer:index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc[AcceptHeaderServiceForRest], xref:refguide:viewer:index/ [...]
****
|Apache Isis Viewer - RO (Testing)
@@ -5684,17 +5438,17 @@ package "Tooling\n[Software System]" {
rectangle "==Apache Isis - Tooling\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
rectangle "==Apache Isis - Tooling - C4 Modeling\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
rectangle "==Apache Isis - Tooling - CLI (Command Line Interface)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
- rectangle "==Apache Isis - Tooling - Java DSL (Code Gen)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
- rectangle "==Apache Isis - Tooling - Java Model (Code Mining)\n<size:10>[Container: packaging: jar]</size>" <<7>> as 7
- rectangle "==Apache Isis - Tooling - Java to Asciidoc (Code Mining)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
+ rectangle "==Apache Isis - Tooling - Java Model (Code Mining)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
+ rectangle "==Apache Isis - Tooling - Java to Asciidoc (Code Mining)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+ rectangle "==Apache Isis - Tooling - Meta Programming\n<size:10>[Container: packaging: jar]</size>" <<7>> as 7
rectangle "==Apache Isis - Tooling - Model for AsciiDoc\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
rectangle "==Apache Isis - Tooling - Project Model (Code mining)\n<size:10>[Container: packaging: jar]</size>" <<9>> as 9
}
2 .[#707070].> 3 : ""
2 .[#707070].> 4 : ""
+2 .[#707070].> 6 : ""
2 .[#707070].> 5 : ""
2 .[#707070].> 7 : ""
-2 .[#707070].> 6 : ""
2 .[#707070].> 8 : ""
2 .[#707070].> 9 : ""
@enduml
@@ -5768,24 +5522,6 @@ org.apache.isis.tooling:isis-tooling-model4adoc:jar:<managed> +
org.apache.isis.tooling:isis-tooling-projectmodel:jar:<managed> +
****
-|Apache Isis - Tooling - Java DSL (Code Gen)
-[source,yaml]
-----
-Group: org.apache.isis.tooling
-Artifact: isis-tooling-dsl
-Type: jar
-Directory: /tooling/dsl
-----
-|Tools for Java meta-programming and runtime class generaton.
-
-.Dependencies
-****
-com.graphql-java:graphql-java:jar:${graphql-java.version} +
-com.squareup:javapoet:jar:${javapoet.version} +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.logging.log4j:log4j-core:jar:<managed> +
-****
-
|Apache Isis - Tooling - Java to Asciidoc (Code Mining)
[source,yaml]
----
@@ -5821,6 +5557,29 @@ com.github.javaparser:javaparser-core:jar:${javaparser.version} +
org.apache.isis.commons:isis-commons:jar:<managed> +
****
+|Apache Isis - Tooling - Meta Programming
+[source,yaml]
+----
+Group: org.apache.isis.tooling
+Artifact: isis-tooling-metaprog
+Type: jar
+Directory: /tooling/metaprog
+----
+|Tools for Java meta-programming and runtime class generaton.
+
+.Dependencies
+****
+com.graphql-java:graphql-java:jar:<managed> +
+com.squareup:javapoet:jar:${javapoet.version} +
+org.apache.isis.commons:isis-commons:jar:<managed> +
+org.apache.logging.log4j:log4j-core:jar:<managed> +
+org.assertj:assertj-core:jar:<managed> +
+org.junit.jupiter:junit-jupiter-api:jar:<managed> +
+org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
+org.junit.jupiter:junit-jupiter-params:jar:<managed> +
+org.junit.vintage:junit-vintage-engine:jar:<managed> +
+****
+
|Apache Isis - Tooling - Model for AsciiDoc
[source,yaml]
----
@@ -5889,12 +5648,12 @@ skinparam rectangle<<22>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
@@ -5979,12 +5738,12 @@ skinparam rectangle<<20>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
diff --git a/extensions/adoc/modules/ROOT/pages/about.adoc b/extensions/adoc/modules/ROOT/pages/about.adoc
index b5444f19f7..c08acdef5b 100644
--- a/extensions/adoc/modules/ROOT/pages/about.adoc
+++ b/extensions/adoc/modules/ROOT/pages/about.adoc
@@ -14,8 +14,7 @@ This page catalogues all the available extensions, but they are incorporated int
|
-xref:userguide:fun:about.adoc[User Guide] +
-for core extensions:
+xref:userguide:fun:about.adoc[User Guide] (core extensions):
include::userguide:ROOT:partial$extensions.adoc[]
diff --git a/extensions/core/executionoutbox/adoc/modules/executionoutbox/partials/module-nav.adoc b/extensions/core/executionoutbox/adoc/modules/executionoutbox/partials/module-nav.adoc
index 065e1bfd73..5221085ea8 100644
--- a/extensions/core/executionoutbox/adoc/modules/executionoutbox/partials/module-nav.adoc
+++ b/extensions/core/executionoutbox/adoc/modules/executionoutbox/partials/module-nav.adoc
@@ -1,6 +1,6 @@
-** xref:userguide:executionlog:about.adoc[Execution Log]
+** xref:userguide:executionoutbox:about.adoc[Execution Outbox]
diff --git a/security/adoc/modules/ROOT/partials/extensions.adoc b/security/adoc/modules/ROOT/partials/extensions.adoc
index 4906738fd6..2f953d87fc 100644
--- a/security/adoc/modules/ROOT/partials/extensions.adoc
+++ b/security/adoc/modules/ROOT/partials/extensions.adoc
@@ -1,5 +1,6 @@
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
include::security:spring-oauth2:partial$module-nav.adoc[]
+include::security:keycloak:partial$module-nav.adoc[]
include::security:secman:partial$module-nav.adoc[]
include::security:audittrail:partial$module-nav.adoc[]
include::security:sessionlog:partial$module-nav.adoc[]
diff --git a/security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc b/security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc
index bb357c6edd..12ef87fb94 100644
--- a/security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc
+++ b/security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:security:keycloak:about.adoc[Keycloak Implementation]
+** xref:security:keycloak:about.adoc[Keycloak Implementation]
[isis] 03/06: ISIS-2965: updates bom/pom.xml project.build.outputTimestamp to fixed value (reproducibility)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c65e947e8a58f5ed06c707241f0827f4fa2a9015
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 15:28:49 2022 +0100
ISIS-2965: updates bom/pom.xml project.build.outputTimestamp to fixed value (reproducibility)
---
bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 1985a1e25e..c21edb7ba4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -312,7 +312,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<maven.plugin.tools.version>3.6.4</maven.plugin.tools.version>
<!-- for m-plugin-p and maven-plugin-annotations -->
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2022-08-22T15:28:38Z</project.build.outputTimestamp>
<!-- APACHE ISIS customisation 6/21: start -->
[isis] 02/06: ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5206dfda83a3fdba7e9be9afffea47274cddfe35
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 15:26:14 2022 +0100
ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version)
---
bom/pom.xml | 2450 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 1233 insertions(+), 1217 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index e32818c70a..1985a1e25e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -17,85 +17,64 @@ 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/ -->
+<!--
+This pom is the top-level parent, responsible for deploying to ASF using the apache-release, and as defined in org.apache:apache global parent.
+At the same time, we want it to inherit from org.springframework.boot:spring-boot-starter-parent.
+It is therefore a copy of org.apache:apache, with customisations clearly identified (though some plugins versions have been bumped to more recent versions).
+-->
- <!-- ORG.APACHE:APACHE : commented out : start
+<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>
+ <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ -->
+ <!-- APACHE ISIS customisation 1/21: : 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 -->
+ <version>27</version>
+ -->
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.7.3</version>
+ <relativePath/>
+ </parent>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>isis-bom</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <!-- APACHE ISIS customisation 1/21: end -->
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.3</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.isis</groupId>
- <artifactId>isis-bom</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- APACHE ISIS customisation 1/15: end -->
-
-
- <!-- ORG.APACHE:APACHE : commented out : start
+ <packaging>pom</packaging>
+ <!-- APACHE ISIS customisation 2/21: 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>
+ -->
+ <name>Apache Isis</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.
+ Apache Isis Bill of Material (BOM).
+ Also the parent POM for the core framework and extensions.
</description>
- <url>https://www.apache.org/</url>
-
- ORG.APACHE:APACHE : commented out : end -->
-
- <!-- APACHE ISIS customisation 2/15: start -->
- <name>Apache Isis</name>
- <description>
- Apache Isis Bill of Material (BOM).
- Also the parent POM for the core framework and extensions.
- </description>
-
<url>https://isis.apache.org</url>
- <inceptionYear>2010</inceptionYear>
- <!-- APACHE ISIS customisation 2/15: 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>
+ <!-- APACHE ISIS customisation 2/21: 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>
+
+ <!-- APACHE ISIS customisation 3/21: start -->
+ <!--
+ <mailingLists>
<mailingList>
<name>Apache Announce List</name>
<subscribe>announce-subscribe@apache.org</subscribe>
@@ -104,859 +83,850 @@ under the License.
<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>
+ <tag>apache-27</tag>
</scm>
- ORG.APACHE:APACHE : commented out : end -->
-
- <!-- APACHE ISIS customisation 3/15: 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/15: 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_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>
-
- <lombok.version>1.18.24</lombok.version> <!-- overriding Spring -->
- <delombok.output>${project.build.directory}/delombok</delombok.output>
- <surefire.version>3.0.0-M7</surefire.version>
- <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine>
- <!-- APACHE ISIS customisation 4/15: end -->
-
- <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
- <!-- set this property for all derived projects:
- -->
+ -->
+ <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>
+ <!-- APACHE ISIS customisation 3/21: 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>
+ <!-- APACHE ISIS customisation 4/21: start -->
+ <inceptionYear>2010</inceptionYear>
+ <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 4/21: end -->
+ <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.2.5</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
+
+ <!-- APACHE ISIS customisation 5/21: 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>
+ <surefire.version>3.0.0-M7</surefire.version>
+ <!-- APACHE ISIS customisation 5/21: end -->
+
+ <!-- for surefire, failsafe and surefire-report -->
+ <maven.plugin.tools.version>3.6.4</maven.plugin.tools.version>
+ <!-- for m-plugin-p and maven-plugin-annotations -->
+ <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <!-- APACHE ISIS customisation 6/21: start -->
+
+ <delombok.output>${project.build.directory}/delombok</delombok.output>
+
<!-- LIBRARY DEPENDENCIES -->
- <archunit.version>0.23.1</archunit.version>
- <asciidoctorj.version>2.5.5</asciidoctorj.version>
- <asm.version>9.3</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
- <approvaltests.version>18.0.0</approvaltests.version>
+ <archunit.version>0.23.1</archunit.version>
+ <asciidoctorj.version>2.5.5</asciidoctorj.version>
+ <asm.version>9.3</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
+ <approvaltests.version>18.0.0</approvaltests.version>
- <assertj-guava.version>3.5.0</assertj-guava.version>
+ <assertj-guava.version>3.5.0</assertj-guava.version>
- <camel.version>3.14.3</camel.version>
+ <camel.version>3.14.3</camel.version>
- <commons-email.version>1.5</commons-email.version>
- <commons-httpclient.version>4.5.12</commons-httpclient.version>
- <commons-io.version>2.11.0</commons-io.version>
+ <commons-email.version>1.5</commons-email.version>
+ <commons-httpclient.version>4.5.12</commons-httpclient.version>
+ <commons-io.version>2.11.0</commons-io.version>
- <cucumber.version>7.6.0</cucumber.version>
+ <cucumber.version>7.6.0</cucumber.version>
- <cxf-rt-rs-client.version>3.5.3</cxf-rt-rs-client.version>
+ <cxf-rt-rs-client.version>3.5.3</cxf-rt-rs-client.version>
- <danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
- <danhaywood-java-testsupport.version>1.0.0</danhaywood-java-testsupport.version>
+ <danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
+ <danhaywood-java-testsupport.version>1.0.0</danhaywood-java-testsupport.version>
- <datanucleus-api-jdo.version>6.0.0-release</datanucleus-api-jdo.version>
- <datanucleus-api-jpa.version>6.0.0-release</datanucleus-api-jpa.version>
- <datanucleus-core.version>6.0.0-release</datanucleus-core.version>
- <datanucleus-jdo-api.version>3.2.1</datanucleus-jdo-api.version>
- <datanucleus-jdo-query.version>6.0.0-release</datanucleus-jdo-query.version>
- <datanucleus-jodatime.version>6.0.0-release</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
- <datanucleus-rdbms.version>6.0.0-release</datanucleus-rdbms.version>
+ <datanucleus-api-jdo.version>6.0.0-release</datanucleus-api-jdo.version>
+ <datanucleus-api-jpa.version>6.0.0-release</datanucleus-api-jpa.version>
+ <datanucleus-core.version>6.0.0-release</datanucleus-core.version>
+ <datanucleus-jdo-api.version>3.2.1</datanucleus-jdo-api.version>
+ <datanucleus-jdo-query.version>6.0.0-release</datanucleus-jdo-query.version>
+ <datanucleus-jodatime.version>6.0.0-release</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
+ <datanucleus-rdbms.version>6.0.0-release</datanucleus-rdbms.version>
- <docx4j.version>11.3.2</docx4j.version>
+ <docx4j.version>11.3.2</docx4j.version>
- <easymock.version>4.3</easymock.version>
- <error_prone_annotations.version>2.15.0</error_prone_annotations.version>
+ <easymock.version>4.3</easymock.version>
+ <error_prone_annotations.version>2.15.0</error_prone_annotations.version>
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <guava.version>31.1-jre</guava.version>
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+ <guava.version>31.1-jre</guava.version>
- <htmlparser.version>2.1</htmlparser.version>
+ <htmlparser.version>2.1</htmlparser.version>
- <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
- <jakartaee.version>8.0.0</jakartaee.version>
- <javafaker.version>1.0.2</javafaker.version>
- <javassist.version>3.29.1-GA</javassist.version>
- <javax-servlet.version>4.0.1</javax-servlet.version>
- <jaxb-impl.version>2.3.6</jaxb-impl.version>
- <jaxws-ri.version>2.3.5</jaxws-ri.version>
+ <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
+ <jakartaee.version>8.0.0</jakartaee.version>
+ <javafaker.version>1.0.2</javafaker.version>
+ <javassist.version>3.29.1-GA</javassist.version>
+ <javax-servlet.version>4.0.1</javax-servlet.version>
+ <jaxb-impl.version>2.3.6</jaxb-impl.version>
+ <jaxws-ri.version>2.3.5</jaxws-ri.version>
- <jbcrypt.version>0.4</jbcrypt.version>
- <jboss-jaxrs-api_2.0_spec.version>1.0.1.Final</jboss-jaxrs-api_2.0_spec.version>
+ <jbcrypt.version>0.4</jbcrypt.version>
+ <jboss-jaxrs-api_2.0_spec.version>1.0.1.Final</jboss-jaxrs-api_2.0_spec.version>
- <!-- v3.2 not available yet, use datanucleus staging for now -->
- <!-- <jdo-api.version>3.2</jdo-api.version> -->
+ <!-- v3.2 not available yet, use datanucleus staging for now -->
+ <!-- <jdo-api.version>3.2</jdo-api.version> -->
- <jdom.version>2.0.6.1</jdom.version>
- <jmock.version>2.12.0</jmock.version>
- <joda-time.version>2.11.0</joda-time.version>
- <jopt-simple.version>6.0-alpha-3</jopt-simple.version>
+ <jdom.version>2.0.6.1</jdom.version>
+ <jmock.version>2.12.0</jmock.version>
+ <joda-time.version>2.11.0</joda-time.version>
+ <jopt-simple.version>6.0-alpha-3</jopt-simple.version>
- <jquery-ui.version>1.13.2</jquery-ui.version> <!-- org.webjars:jquery-ui -->
+ <jquery-ui.version>1.13.2</jquery-ui.version> <!-- org.webjars:jquery-ui -->
- <jsr305.version>3.0.2</jsr305.version>
- <jsoup.version>1.15.2</jsoup.version>
- <junit-jupiter.version>5.9.0</junit-jupiter.version> <!-- overrides spring -->
- <junit-platform.version>1.9.0</junit-platform.version>
+ <jsr305.version>3.0.2</jsr305.version>
+ <jsoup.version>1.15.2</jsoup.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version> <!-- overrides spring -->
+ <junit-platform.version>1.9.0</junit-platform.version>
- <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
+ <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
+ <lombok.version>1.18.24</lombok.version> <!-- overriding Spring -->
- <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
- <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
- <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+ <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
- <!-- See https://nodejs.org/en/download/ for latest node and npm (lts)
- versions -->
- <node.version>v16.15.0</node.version>
- <npm.version>8.9.0</npm.version>
+ <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
+ <node.version>v16.15.0</node.version>
+ <npm.version>8.9.0</npm.version>
- <objenesis.version>3.3</objenesis.version>
- <ognl.version>3.3.3</ognl.version>
+ <objenesis.version>3.3</objenesis.version>
+ <ognl.version>3.3.3</ognl.version>
- <picocontainer.version>2.15</picocontainer.version>
- <poi.version>5.2.2</poi.version>
+ <picocontainer.version>2.15</picocontainer.version>
+ <poi.version>5.2.2</poi.version>
- <quartz-scheduler.version>2.3.2</quartz-scheduler.version>
+ <quartz-scheduler.version>2.3.2</quartz-scheduler.version>
- <resteasy-spring-boot-starter.version>5.0.0.Final</resteasy-spring-boot-starter.version>
- <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
+ <resteasy-spring-boot-starter.version>5.0.0.Final</resteasy-spring-boot-starter.version>
+ <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
- <select2.version>4.0.13</select2.version>
- <shiro.version>1.9.1</shiro.version>
- <simpleslackapi.version>1.3.0</simpleslackapi.version>
- <slf4j-api.version>1.7.36</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
- <spring-boot.version>2.7.3</spring-boot.version>
- <summernote.version>0.8.11</summernote.version>
- <swagger-core.version>1.6.6</swagger-core.version>
+ <select2.version>4.0.13</select2.version>
+ <shiro.version>1.9.1</shiro.version>
+ <simpleslackapi.version>1.3.0</simpleslackapi.version>
+ <slf4j-api.version>1.7.36</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
+ <spring-boot.version>2.7.3</spring-boot.version>
+ <summernote.version>0.8.11</summernote.version>
+ <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine>
+ <swagger-core.version>1.6.6</swagger-core.version>
- <togglz.version>3.2.1</togglz.version>
+ <togglz.version>3.2.1</togglz.version>
- <vaadin.version>23.1.6</vaadin.version>
+ <vaadin.version>23.1.6</vaadin.version>
- <wicket.version>9.11.0</wicket.version>
- <wicket-bootstrap.version>6.0.0-M7</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
- <wicket-webjars.version>3.0.4</wicket-webjars.version>
- <wicket-viewer-jquery.version>3.5.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
+ <wicket.version>9.11.0</wicket.version>
+ <wicket-bootstrap.version>6.0.0-M7</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
+ <wicket-webjars.version>3.0.4</wicket-webjars.version>
+ <wicket-viewer-jquery.version>3.5.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
- <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
- <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
+ <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
+ <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
+ <!-- APACHE ISIS customisation 6/21: end -->
</properties>
-
-<!-- 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>
- <extensions>
- <!-- scp and sftp support for deployments. -->
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>3.5.2</version>
- </extension>
- <!-- ftp support for deployments. -->
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>3.5.2</version>
- </extension>
- </extensions>
-
- <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.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.2.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.3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>3.0.0</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.3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.3.0</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>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven.plugin.tools.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <!-- APACHE ISIS customisation 7/21: start -->
+ <!-- breaks dependabot run: timeout due to repo not accessible
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <!-- APACHE ISIS customisation 7/21: end -->
+ </repositories>
+ <pluginRepositories>
+ <!-- APACHE ISIS customisation 8/21: start -->
+ <!-- breaks dependabot run: timeout due to repo not accessible
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ -->
+ <!-- APACHE ISIS customisation 8/21: end -->
+ </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.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.4.2</version> <!--bumped-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.0.0</version> <!--bumped-->
+ </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>3.1.0</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.3.0</version> <!--bumped-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.0.1</version> <!--bumped-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.2</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.4.0</version>
<configuration>
- <notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
+ <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.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven.plugin.tools.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.4.1</version> <!--bumped-->
<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>${maven-release-plugin.version}</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
+ </plugin>
+ <!-- START SNIPPET: release-plugin-configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>3.0.0-M6</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>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.13.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.12.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>
- <configuration>
- <!-- override defaults and include everything unless explicitly excluded -->
- <includes>
- <include>**/*.java</include>
- </includes>
- <excludes>
- <exclude>${testsToExclude}</exclude>
- </excludes>
- <printSummary>false</printSummary>
- <argLine>${surefire-plugin.argLine}</argLine>
- <forkCount>1C</forkCount>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <!-- allows tests to reduce verbosity, or conditionally disable
- when run with surefire; e.g.:
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
- -->
- <isRunningWithSurefire>true</isRunningWithSurefire>
- </systemPropertyVariables>
- </configuration>
- </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.3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.14</version>
-
- <!-- APACHE ISIS customisation 5/15: 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>**/*.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>**/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>
- <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 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>
- <!-- 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>
+ </configuration>
+ </plugin>
+ <!-- END SNIPPET: release-plugin-configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>3.0.0</version> <!--bumped-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.0</version> <!--bumped-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.13.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.12.1</version> <!--bumped-->
+ </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>
+ <!-- APACHE ISIS customisation 9/21: start -->
+ <configuration>
+ <!-- override defaults and include everything unless explicitly excluded -->
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>${testsToExclude}</exclude>
+ </excludes>
+ <printSummary>false</printSummary>
+ <argLine>${surefire-plugin.argLine}</argLine>
+ <forkCount>1C</forkCount>
+ <reuseForks>true</reuseForks>
+ <systemPropertyVariables>
+ <!-- allows tests to reduce verbosity, or conditionally disable
+ when run with surefire; e.g.:
+ @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+ -->
+ <isRunningWithSurefire>true</isRunningWithSurefire>
+ </systemPropertyVariables>
+ </configuration>
+ <!-- APACHE ISIS customisation 9/21: end -->
+ </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.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.14</version>
+ <!-- APACHE ISIS customisation 10/21: 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>**/*.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>**/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>
+ <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 10/21: end -->
+ </plugin>
+ <!-- APACHE ISIS customisation 11/21: start -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-docck-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <!-- APACHE ISIS customisation 11/21: end -->
+ </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>
- <!-- APACHE ISIS customisation 7/15: start -->
-
- <!-- 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>
- <!-- APACHE ISIS customisation 7/15: end -->
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- APACHE ISIS customisation 8/15: start -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.6,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>[11,)</version>
- </requireJavaVersion>
- <!-- seemingly not compatible with use of 2.0.0-SNAPSHOT placeholders
- <requirePluginVersions> <message>All plugin versions must be defined!</message>
- <banLatest>true</banLatest> <banRelease>true</banRelease> </requirePluginVersions> -->
- <DependencyConvergence />
- </rules>
- </configuration>
- <!-- goal:enforce supposedly binds to phase:validate, but explicit binding
- seems to be required -->
- <executions>
- <execution>
- <id>validate-enforce</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- <execution>
- <id>enforce-maven-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <!-- APACHE ISIS customisation 12/21: start -->
+
+ <!-- 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~2022</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>
+ <!-- APACHE ISIS customisation 12/21: end -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <!-- APACHE ISIS customisation 13/21: start -->
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.6,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ </requireJavaVersion>
+ <!-- seemingly not compatible with use of 2.0.0-SNAPSHOT placeholders
+ <requirePluginVersions> <message>All plugin versions must be defined!</message>
+ <banLatest>true</banLatest> <banRelease>true</banRelease> </requirePluginVersions> -->
+ <DependencyConvergence />
+ </rules>
+ </configuration>
+ <!-- APACHE ISIS customisation 13/21: end -->
+ <executions>
+ <!-- APACHE ISIS customisation 14/21: start -->
+ <!-- goal:enforce supposedly binds to phase:validate, but explicit binding seems to be required -->
+ <execution>
+ <id>validate-enforce</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ <!-- APACHE ISIS customisation 14/21: end -->
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
<version>${minimalMavenBuildVersion}</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
<execution>
<id>enforce-java-version</id>
<goals>
@@ -970,351 +940,397 @@ under the License.
</rules>
</configuration>
</execution>
- </executions>
- </plugin>
- <!-- APACHE ISIS customisation 8/15: end -->
- <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>
- </plugins>
- </build>
-
- <profiles>
- <!-- START SNIPPET: release-profile -->
- <profile>
- <id>apache-release</id>
- <!-- APACHE ISIS customisation 9/15: start -->
- <activation>
- <property>
- <name>apache-release</name>
- </property>
- </activation>
- <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>
- <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>
- <!-- 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
- 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>
- <!-- APACHE ISIS customisation 11/15: start -->
- <archiveBaseDirectory>..</archiveBaseDirectory>
- <!-- APACHE ISIS customisation 11/15: end -->
+ </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>
+ </plugins>
+ <!-- APACHE ISIS customisation 15/21: start -->
+ <extensions>
+ <!-- scp and sftp support for deployments. -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>3.5.2</version>
+ </extension>
+ <!-- ftp support for deployments. -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>3.5.2</version>
+ </extension>
+ </extensions>
+ <!-- APACHE ISIS customisation 15/21: end -->
+ </build>
+ <profiles>
+ <!-- START SNIPPET: release-profile -->
+ <profile>
+ <id>apache-release</id>
+ <!-- APACHE ISIS customisation 16/21: start -->
+ <activation>
+ <property>
+ <name>apache-release</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <!-- APACHE ISIS customisation 16/21: end -->
+ <build>
+ <plugins>
+ <!-- APACHE ISIS customisation 17/21: start -->
+ <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>
+ <!-- APACHE ISIS customisation 17/21: end -->
+
+ <!-- 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>
+ <!-- APACHE ISIS customisation 18/21: start -->
+ <archiveBaseDirectory>..</archiveBaseDirectory>
+ <!-- APACHE ISIS customisation 18/21: end -->
<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>
- <!-- APACHE ISIS customisation 12/15: start -->
- <configuration>
- <sourcepath>${delombok.output}</sourcepath>
- <doclint>none</doclint>
- </configuration>
- <!-- APACHE ISIS customisation 12/15: end -->
- </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>
+ <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>
+ <!-- APACHE ISIS customisation 19/21: start -->
+ <configuration>
+ <sourcepath>${delombok.output}</sourcepath>
+ <doclint>none</doclint>
+ </configuration>
+ <!-- APACHE ISIS customisation 19/21: end -->
+ </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>
- <!-- APACHE ISIS customisation 13/15: start -->
- <modules>
- <module>../core</module>
- <module>../extensions</module>
- <module>../mavendeps</module>
- <module>../starters</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>
- </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>
-
- <!-- APACHE ISIS customisation 15/15: start -->
-
- <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>github</id>
- <activation>
- <property>
- <name>github</name>
- </property>
- </activation>
- <properties>
- <enforcer.failFast>true</enforcer.failFast>
- <jacoco.skip>true</jacoco.skip>
- </properties>
- <modules>
- <module>../core</module>
- <module>../extensions</module>
- <module>../mavendeps</module>
- <module>../starters</module>
- <module>../testing</module>
- <module>../valuetypes</module>
- </modules>
- <distributionManagement>
- <repository>
- <id>github</id>
- <name>Github Releases</name>
- <url>https://maven.pkg.github.com/apache/isis</url>
- </repository>
- </distributionManagement>
- </profile>
-
- <profile>
- <id>nightly-localfs-repo</id>
- <activation>
- <property>
- <name>nightly-localfs-repo</name>
- </property>
- </activation>
- <distributionManagement>
- <repository>
- <id>nightly-localfs-repo</id>
- <name>Temporary Local Filesystem Staging Repository</name>
- <url>file://${MVN_SNAPSHOTS_PATH}</url>
- </repository>
- </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <altDeploymentRepository>
- nightly-localfs-repo::default::file://${MVN_SNAPSHOTS_PATH}
- </altDeploymentRepository>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jacoco-report-xml</id>
- <activation>
- <property>
- <name>jacoco-report-xml</name>
- </property>
- </activation>
- <properties>
- <surefire-plugin.argLine>@{argLine} -Xmx512m</surefire-plugin.argLine>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.8</version>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <formats>XML</formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <!-- APACHE ISIS customisation 15/15: end -->
- </profiles>
+ </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>
+ <!-- APACHE ISIS customisation 20/21: start -->
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ <!-- APACHE ISIS customisation 20/21: end -->
+ </profile>
+ <!-- END SNIPPET: release-profile -->
+ <profile>
+ <id>only-eclipse</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Disable execution of some plugins in m2e (https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html) -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <!-- as this is an artificial artifact only use in a profile (https://bugs.eclipse.org/bugs/show_bug.cgi?id=367870#c18) -->
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!-- no native m2e support yet (https://issues.apache.org/jira/browse/MRRESOURCES-85) -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[0,1.8.0)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <!-- APACHE ISIS customisation 21/21: start -->
+ <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>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>github</id>
+ <activation>
+ <property>
+ <name>github</name>
+ </property>
+ </activation>
+ <properties>
+ <enforcer.failFast>true</enforcer.failFast>
+ <jacoco.skip>true</jacoco.skip>
+ </properties>
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ <distributionManagement>
+ <repository>
+ <id>github</id>
+ <name>Github Releases</name>
+ <url>https://maven.pkg.github.com/apache/isis</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>nightly-localfs-repo</id>
+ <activation>
+ <property>
+ <name>nightly-localfs-repo</name>
+ </property>
+ </activation>
+ <distributionManagement>
+ <repository>
+ <id>nightly-localfs-repo</id>
+ <name>Temporary Local Filesystem Staging Repository</name>
+ <url>file://${MVN_SNAPSHOTS_PATH}</url>
+ </repository>
+ </distributionManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <altDeploymentRepository>
+ nightly-localfs-repo::default::file://${MVN_SNAPSHOTS_PATH}
+ </altDeploymentRepository>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jacoco-report-xml</id>
+ <activation>
+ <property>
+ <name>jacoco-report-xml</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire-plugin.argLine>@{argLine} -Xmx512m</surefire-plugin.argLine>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <formats>XML</formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- APACHE ISIS customisation 21/21: end -->
+ </profiles>
</project>
[isis] 05/06: ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (3)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8614da2041c705a8392229db0d8e087721238d84
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 15:33:04 2022 +0100
ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (3)
---
bom/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index e90dc1a3ec..ac3472a262 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -388,6 +388,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<lombok.version>1.18.24</lombok.version> <!-- overriding Spring -->
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+ <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
@@ -580,7 +581,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M6</version>
+ <version>${maven-release-plugin.version}</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
[isis] 04/06: ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (2)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 35bb9fa568e3b5b30bc95d0e83bb8d530d5cc937
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 15:31:10 2022 +0100
ISIS-2965: reconciles bom/pom.xml with org.apache:apache:27 (latest version) (2)
---
bom/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/bom/pom.xml b/bom/pom.xml
index c21edb7ba4..e90dc1a3ec 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -448,6 +448,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<enabled>false</enabled>
</releases>
</repository>
+ -->
<!-- APACHE ISIS customisation 7/21: end -->
</repositories>
<pluginRepositories>
[isis] 01/06: ISIS-2965: adds missing licenses into supplemental-licenses.xml
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e81fd66521bfda5ce7e2eb6591209452e146b1bf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 14:31:15 2022 +0100
ISIS-2965: adds missing licenses into supplemental-licenses.xml
---
.../src/main/resources/supplemental-models.xml | 80 +++++++++++++++++++++-
1 file changed, 78 insertions(+), 2 deletions(-)
diff --git a/supplemental-model/src/main/resources/supplemental-models.xml b/supplemental-model/src/main/resources/supplemental-models.xml
index d859eaca54..23844cee66 100644
--- a/supplemental-model/src/main/resources/supplemental-models.xml
+++ b/supplemental-model/src/main/resources/supplemental-models.xml
@@ -20,8 +20,8 @@
<version>1.0</version>
<licenses>
<license>
- <name>Apache License, v2.0</name>
- <url>http://www.apache.org/licenses/</url>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
</project>
@@ -102,4 +102,80 @@
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>web-streams-polyfill</artifactId>
+ <version>4.0.0-beta.3</version>
+ <name>web-streams-polyfill</name>
+ <licenses>
+ <license>
+ <name>MIT License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>pdfjs-dist</artifactId>
+ <version>2.14.305</version>
+ <name>PDF.js</name>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>summernote</artifactId>
+ <version>0.8.20</version>
+ <name>Summernote</name>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>https://spdx.org/licenses/MIT</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>org.webjars.bowergithub.prismjs</groupId>
+ <artifactId>prism</artifactId>
+ <version>1.28.0</version>
+ <name>Prism</name>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>https://spdx.org/licenses/MIT</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>dommatrix</artifactId>
+ <version>1.0.3</version>
+ <name>DOMMatrix</name>
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>https://spdx.org/licenses/MIT</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+
</supplementalDataModels>