You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/07/30 15:46:23 UTC
[isis] branch master updated: ISIS-2341: fixes glitches with 'mvn
site'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new b19fcf6 ISIS-2341: fixes glitches with 'mvn site'
b19fcf6 is described below
commit b19fcf66c3be5bee9790c21cd963de57d6ac6493
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 30 17:46:05 2020 +0200
ISIS-2341: fixes glitches with 'mvn site'
---
mavendeps/pom.xml | 18 +++++-----
starters/pom.xml | 85 ++++++++++++++++++++++------------------------
supplemental-model/pom.xml | 22 ++++++++----
3 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index c6cb21e..1b15fe1 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -123,15 +123,15 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.hsqldb</groupId> -->
+<!-- <artifactId>hsqldb</artifactId> -->
+<!-- </dependency> -->
+
+<!-- <dependency> -->
+<!-- <groupId>com.h2database</groupId> -->
+<!-- <artifactId>h2</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</dependencyManagement>
diff --git a/starters/pom.xml b/starters/pom.xml
index 1e16d3c..292c249 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -1,28 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- this must come before <parent> because the version is manually updated in build-core.sh -->
+ <!-- this must come before <parent> because the version is manually updated
+ in build-core.sh -->
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
@@ -32,7 +27,7 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.2.RELEASE</version>
- <relativePath/>
+ <relativePath />
</parent>
<name>Apache Isis Starter Parent</name>
@@ -44,7 +39,7 @@ under the License.
<properties>
- <maven.compiler.arg>-parameters</maven.compiler.arg>
+ <maven.compiler.arg>-parameters</maven.compiler.arg>
<spring-boot.version>2.3.2.RELEASE</spring-boot.version>
<approvaltests.version>4.0.2</approvaltests.version>
@@ -73,6 +68,19 @@ under the License.
<!-- goal:compile binds to phase:compile -->
<!-- goal:testCompile binds to phase:test-compile -->
</plugin>
+
+ <!-- SITE REPORT -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
@@ -94,23 +102,11 @@ under the License.
<type>pom</type>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.legacy</groupId>
- <artifactId>isis-legacy</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
--->
+ <!-- <dependency> <groupId>org.apache.isis.incubator</groupId> <artifactId>isis-incubator</artifactId>
+ <version>2.0.0-SNAPSHOT</version> <scope>import</scope> <type>pom</type>
+ </dependency> <dependency> <groupId>org.apache.isis.legacy</groupId> <artifactId>isis-legacy</artifactId>
+ <version>2.0.0-SNAPSHOT</version> <scope>import</scope> <type>pom</type>
+ </dependency> -->
<dependency>
<groupId>org.apache.isis.mappings</groupId>
@@ -135,7 +131,7 @@ under the License.
<scope>import</scope>
<type>pom</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-integtests</artifactId>
@@ -243,9 +239,7 @@ under the License.
</activation>
<properties>
- <!--
- uses maven-surefire-plugin.version, which is declared by spring-boot-starter-parent
- -->
+ <!-- uses maven-surefire-plugin.version, which is declared by spring-boot-starter-parent -->
<skipTests>false</skipTests>
<skipUTs>${skipTests}</skipUTs>
<skipITs>${skipTests}</skipITs>
@@ -442,7 +436,8 @@ under the License.
</includes>
</fileSet>
</fileSets>
- <failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum: don't consider error -->
+ <failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum:
+ don't consider error -->
</configuration>
</plugin>
</plugins>
diff --git a/supplemental-model/pom.xml b/supplemental-model/pom.xml
index b52189b..84caa23 100644
--- a/supplemental-model/pom.xml
+++ b/supplemental-model/pom.xml
@@ -14,12 +14,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.isis</groupId>
- <artifactId>supplemental-model</artifactId>
- <version>1.0</version>
-
- <name>Apache Isis Supplemental - Legal Info</name>
- <description>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>supplemental-model</artifactId>
+ <version>1.0</version>
+
+ <name>Apache Isis Supplemental - Legal Info</name>
+ <description>
For example, the templates used by many Apache distributions assemble a listing of project dependencies
according to their organization name (and URL), along with the URL each project's website. When dependency
POMs are missing this information, the dependency notice file that the Remote Resources Plugin renders can
@@ -31,6 +31,16 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>