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 65d1b8d74e2c2d049cd6558bc88819d8419d136c
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Mon Sep 26 08:58:30 2022 +0100
ISIS-2965: simplifies javadoc plugin
to ensure all running against delombok-ed source.
---
bom/pom.xml | 16 ++++++++
core/pom.xml | 40 -------------------
extensions/core/quartz/impl/pom.xml | 16 --------
extensions/security/shiro-realm-ldap/impl/pom.xml | 16 --------
extensions/vw/exceldownload/wicket-ui/pom.xml | 17 --------
.../vw/fullcalendar/wicket/integration/pom.xml | 17 --------
extensions/vw/fullcalendar/wicket/ui/pom.xml | 19 +--------
extensions/vw/pdfjs/wicket/integration/pom.xml | 41 ++++++-------------
extensions/vw/pdfjs/wicket/ui/pom.xml | 35 +++++-----------
extensions/vw/sse/wicket/pom.xml | 39 ++++++------------
persistence/jdo/spring/pom.xml | 46 +++++++---------------
testing/archtestsupport/applib/pom.xml | 17 --------
testing/h2console/ui/pom.xml | 36 +++++------------
valuetypes/asciidoc/ui/wicket/pom.xml | 17 --------
valuetypes/markdown/ui/wicket/pom.xml | 17 --------
viewers/wicket/ui/pom.xml | 13 +-----
viewers/wicket/viewer/pom.xml | 29 ++++----------
17 files changed, 83 insertions(+), 348 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index c2099dc482..33259fd719 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1077,8 +1077,24 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</goals>
<!-- APACHE ISIS customisation 19/21: start -->
<configuration>
+ <notimestamp>true</notimestamp>
<sourcepath>${delombok.output}</sourcepath>
<doclint>none</doclint>
+ <failOnError>false</failOnError>
+
+ <debug>true</debug>
+ <minmemory>128m</minmemory>
+ <maxmemory>1024m</maxmemory>
+ <quiet>true</quiet>
+ <doctitle>${project.name}
${project.version}</doctitle>
+ <windowtitle>${project.name}
${project.version}</windowtitle>
+ <splitindex>true</splitindex>
+
<encoding>${project.build.sourceEncoding}</encoding>
+ <links>
+
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
+ </links>
+ <linksource>true</linksource>
+
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
<!-- APACHE ISIS customisation 19/21: end -->
</execution>
diff --git a/core/pom.xml b/core/pom.xml
index 6f7187e89c..2e9620f027 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -183,46 +183,6 @@
</plugin>
- <!-- Artifacts derived from code: javadoc;
supports both build and report
- goals; not included as a build plugin
except through profiles (to speed up
- the build) -->
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
-
<version>${maven-javadoc-plugin.version}</version>
- <inherited>true</inherited>
- <configuration>
- <!-- as per
http://stackoverflow.com/a/16743137/56880; only if using
- java 8 to build -->
- <!--
<additionalparam>-Xdoclint:none</additionalparam> -->
- <debug>true</debug>
- <minmemory>128m</minmemory>
- <maxmemory>1024m</maxmemory>
- <quiet>true</quiet>
- <doctitle>${project.name}
${project.version}</doctitle>
- <windowtitle>${project.name}
${project.version}</windowtitle>
- <testDoctitle>${project.name}
${project.version}
- (TEST API)
- </testDoctitle>
- <testWindowtitle>${project.name}
- ${project.version}
(TEST API)
- </testWindowtitle>
- <splitindex>true</splitindex>
-
<encoding>${project.build.sourceEncoding}</encoding>
- <links>
-
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
- </links>
- <linksource>true</linksource>
- <!--
http://jira.codehaus.org/browse/MJAVADOC-268 and
http://jira.codehaus.org/browse/MJAVADOC-284 -->
-
<detectOfflineLinks>false</detectOfflineLinks>
- </configuration>
- <!-- goal:aggregate (for aggregator
modules) has no binding; explicitly
- bound in profiles -->
- <!-- goal:jar (for non-aggregator
modules) binds to phase:package -->
- <!-- goal:test-jar (for non-aggregator
modules) binds to phase:package -->
- <!-- goal:javadoc is a report so is
configured in the reporting section -->
- </plugin>
-
<!-- Packaging: source jars of main and test
code -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/extensions/core/quartz/impl/pom.xml
b/extensions/core/quartz/impl/pom.xml
index 156ba1d949..c1ec50627c 100644
--- a/extensions/core/quartz/impl/pom.xml
+++ b/extensions/core/quartz/impl/pom.xml
@@ -27,22 +27,6 @@
<jar-plugin.automaticModuleName>org.apache.isis.extensions.quartz.impl</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/extensions/quartz/impl</git-plugin.propertiesDir>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml
b/extensions/security/shiro-realm-ldap/impl/pom.xml
index 51982aa4bc..6eb209da78 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -34,22 +34,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/shiro-realm-ldap/impl</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/extensions/vw/exceldownload/wicket-ui/pom.xml
b/extensions/vw/exceldownload/wicket-ui/pom.xml
index 7f9b3106a8..9eb3870c3e 100644
--- a/extensions/vw/exceldownload/wicket-ui/pom.xml
+++ b/extensions/vw/exceldownload/wicket-ui/pom.xml
@@ -34,23 +34,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/exceldownload/wicket-ui</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/extensions/vw/fullcalendar/wicket/integration/pom.xml
b/extensions/vw/fullcalendar/wicket/integration/pom.xml
index f0a90bb919..73bc6f882f 100644
--- a/extensions/vw/fullcalendar/wicket/integration/pom.xml
+++ b/extensions/vw/fullcalendar/wicket/integration/pom.xml
@@ -35,23 +35,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/fullcalendar/wicket/integration</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/extensions/vw/fullcalendar/wicket/ui/pom.xml
b/extensions/vw/fullcalendar/wicket/ui/pom.xml
index df993f1a8f..dddde6815f 100644
--- a/extensions/vw/fullcalendar/wicket/ui/pom.xml
+++ b/extensions/vw/fullcalendar/wicket/ui/pom.xml
@@ -35,23 +35,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/fullcalendar/wicket/ui</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
@@ -63,7 +46,7 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-fullcalendar-applib</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-fullcalendar-wicket-integration</artifactId>
diff --git a/extensions/vw/pdfjs/wicket/integration/pom.xml
b/extensions/vw/pdfjs/wicket/integration/pom.xml
index 20c35ab3df..0e3456ed4c 100644
--- a/extensions/vw/pdfjs/wicket/integration/pom.xml
+++ b/extensions/vw/pdfjs/wicket/integration/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";
@@ -29,23 +29,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/pdfjs/wicket/integration</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this
- switch -->
- <!-- 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, we don't
know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
@@ -57,7 +40,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>pdfjs-dist</artifactId>
@@ -65,13 +48,13 @@
<version>2.16.105</version>
</dependency>
- <!-- pdf.js v1 legacy -->
+ <!-- pdf.js v1 legacy -->
<dependency>
<groupId>org.webjars.bowergithub.mozilla</groupId>
<artifactId>pdfjs-dist</artifactId>
<version>1.10.100</version>
</dependency>
-
+
</dependencies>
</project>
diff --git a/extensions/vw/pdfjs/wicket/ui/pom.xml
b/extensions/vw/pdfjs/wicket/ui/pom.xml
index d3dfd6065e..6ed342f2af 100644
--- a/extensions/vw/pdfjs/wicket/ui/pom.xml
+++ b/extensions/vw/pdfjs/wicket/ui/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";
@@ -28,23 +28,6 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/pdfjs/wicket/ui</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this
- switch -->
- <!-- 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, we don't
know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/extensions/vw/sse/wicket/pom.xml b/extensions/vw/sse/wicket/pom.xml
index 0187867b48..d0f9fca678 100644
--- a/extensions/vw/sse/wicket/pom.xml
+++ b/extensions/vw/sse/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";
@@ -28,25 +28,8 @@
<git-plugin.propertiesDir>org/apache/isis/extensions/sse/wicket</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
-
+
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-sse-metamodel</artifactId>
@@ -57,7 +40,7 @@
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
-
+
</dependencies>
</project>
diff --git a/persistence/jdo/spring/pom.xml b/persistence/jdo/spring/pom.xml
index e77e8d4f60..f11c955787 100644
--- a/persistence/jdo/spring/pom.xml
+++ b/persistence/jdo/spring/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";
@@ -25,12 +25,12 @@
<name>Apache Isis Persistence - JDO (Spring)</name>
<description>
JDO Spring integration.
-
- This is a fork of the Spring ORM JDO sources at github,
+
+ This is a fork of the Spring ORM JDO sources at github,
for which support had been dropped back in 2016 [1].
-
+
Credits to the original authors. See also docs [2].
-
+
[1]
https://github.com/spring-projects/spring-framework/issues/18702
[2]
https://docs.spring.io/spring-framework/docs/3.0.0.RC2/reference/html/ch13s04.html
</description>
@@ -40,22 +40,6 @@
<git-plugin.propertiesDir>org/apache/isis/persistence/jdo/spring</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- ISIS -->
@@ -94,7 +78,7 @@
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -112,4 +96,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/testing/archtestsupport/applib/pom.xml
b/testing/archtestsupport/applib/pom.xml
index 7af1bfc3e2..23579ed196 100644
--- a/testing/archtestsupport/applib/pom.xml
+++ b/testing/archtestsupport/applib/pom.xml
@@ -26,23 +26,6 @@
<git-plugin.propertiesDir>org/apache/isis/testing/archtestsupport/applib</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- archunit 0.20.1 has split package
com.tngtech.archunit.junit -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/testing/h2console/ui/pom.xml b/testing/h2console/ui/pom.xml
index fb863ffdd7..8c229dc583 100644
--- a/testing/h2console/ui/pom.xml
+++ b/testing/h2console/ui/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";
@@ -28,22 +28,6 @@
<git-plugin.propertiesDir>org/apache/isis/testing/h2console/ui</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
@@ -55,7 +39,7 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/valuetypes/asciidoc/ui/wicket/pom.xml
b/valuetypes/asciidoc/ui/wicket/pom.xml
index 3ac7da6f0f..4e7f632e80 100644
--- a/valuetypes/asciidoc/ui/wicket/pom.xml
+++ b/valuetypes/asciidoc/ui/wicket/pom.xml
@@ -28,23 +28,6 @@
<git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui/wkt</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/valuetypes/markdown/ui/wicket/pom.xml
b/valuetypes/markdown/ui/wicket/pom.xml
index e2aa019604..190f8b0b46 100644
--- a/valuetypes/markdown/ui/wicket/pom.xml
+++ b/valuetypes/markdown/ui/wicket/pom.xml
@@ -28,23 +28,6 @@
<git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown/ui/wkt</git-plugin.propertiesDir>
</properties>
- <build>
- <plugins>
- <plugin>
- <!-- can be removed, once isis-viewer-wicket-ui
does no longer need this switch -->
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 86884e8ba8..10b0ba66c1 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -51,17 +51,6 @@
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
</plugin>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -355,7 +344,7 @@
<artifactId>isis-core-runtimeservices</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-jodatime-integration</artifactId>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 8c3f0f9dd2..9acdfe474a 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -7,9 +7,9 @@
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
@@ -53,21 +53,8 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <!-- 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,
- we don't know how to fix otherwise -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
</build>
-
+
<repositories>
<repository>
<id>jitpack.io</id>
@@ -103,12 +90,12 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- Cglib patch START
+
+ <!-- Cglib patch START
as of 2021 Cglib seems inactive - while yet Wicket 8. and 9.
rely on it
Cglib fails to initialize net.sf.cglib.core.ReflectUtils when
running on JVM 16+
- we utilize a jitpack.io build that is based on this patch
-
https://github.com/rototor/cglib/commit/cc8632ed0930879b929b0d07e4ede5ac15103e9f
+ we utilize a jitpack.io build that is based on this patch
+
https://github.com/rototor/cglib/commit/cc8632ed0930879b929b0d07e4ede5ac15103e9f
-->
<dependency>
<groupId>com.github.rototor</groupId>
@@ -121,7 +108,7 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Cglib patch END -->
+ <!-- Cglib patch END -->
<dependency>
<groupId>org.apache.wicket</groupId>
