This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3002
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3002 by this push:
new 3e5482633e ISIS-3002: demo app dependencies
3e5482633e is described below
commit 3e5482633ecdd8fa325d87914a4b686a7552d905
Author: Dan Haywood <[email protected]>
AuthorDate: Tue Jul 12 22:50:16 2022 +0100
ISIS-3002: demo app dependencies
---
examples/demo/wicket/common/pom.xml | 3 ++-
valuetypes/asciidoc/ui/wicket/pom.xml | 33 +++++++++++++++++++--------------
valuetypes/markdown/ui/wicket/pom.xml | 31 ++++++++++++++++++-------------
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/examples/demo/wicket/common/pom.xml
b/examples/demo/wicket/common/pom.xml
index 7e77ced003..8c3b308663 100644
--- a/examples/demo/wicket/common/pom.xml
+++ b/examples/demo/wicket/common/pom.xml
@@ -75,7 +75,7 @@
<artifactId>isis-viewer-wicket-viewer</artifactId>
</dependency>
- <!-- EXTENSIONS -->
+ <!-- VALUE TYPES -->
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
@@ -92,6 +92,7 @@
<artifactId>isis-valuetypes-sse-ui-wkt</artifactId>
</dependency>
+ <!-- EXTENSIONS -->
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
diff --git a/valuetypes/asciidoc/ui/wicket/pom.xml
b/valuetypes/asciidoc/ui/wicket/pom.xml
index 7831c34614..f06e616b40 100644
--- a/valuetypes/asciidoc/ui/wicket/pom.xml
+++ b/valuetypes/asciidoc/ui/wicket/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -22,7 +22,7 @@
<artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId>
<name>Apache Isis Val - Asciidoctor (ui wicket)</name>
-
+
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.ui.wkt</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui/wkt</git-plugin.propertiesDir>
@@ -32,9 +32,9 @@
<plugins>
<plugin>
<!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- overrides defaults as configured in our
core pom,
+ <!-- overrides defaults as configured in our
core pom,
to make javadoc failures non fatal and let the
build continue;
- this we can set on a per module basis, to apply
only to those,
+ this we can set on a per module basis, to apply
only to those,
we don't know how to fix otherwise -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -46,13 +46,18 @@
</build>
<dependencies>
-
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+
<artifactId>isis-valuetypes-asciidoc-metamodel</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-prism-wicket</artifactId>
diff --git a/valuetypes/markdown/ui/wicket/pom.xml
b/valuetypes/markdown/ui/wicket/pom.xml
index 9ec1e3f28b..e9bca9555d 100644
--- a/valuetypes/markdown/ui/wicket/pom.xml
+++ b/valuetypes/markdown/ui/wicket/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -32,9 +32,9 @@
<plugins>
<plugin>
<!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- overrides defaults as configured in our
core pom,
+ <!-- overrides defaults as configured in our
core pom,
to make javadoc failures non fatal and let the
build continue;
- this we can set on a per module basis, to apply
only to those,
+ this we can set on a per module basis, to apply
only to those,
we don't know how to fix otherwise -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -51,8 +51,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
</dependency>
-
- <dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+
<artifactId>isis-valuetypes-markdown-metamodel</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-prism-wicket</artifactId>
<version>${project.version}</version>
