This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-cache.git
The following commit(s) were added to refs/heads/master by this push:
new 118e6cd Changing scm url and improving site generation
118e6cd is described below
commit 118e6cd014b243ff15450425c69fc1b2b6a9348c
Author: Martin Stockhammer <martin.stockham...@ars.de>
AuthorDate: Sun Apr 15 14:51:01 2018 +0200
Changing scm url and improving site generation
---
pom.xml | 35 +++++++++++++++++-----
spring-cache-api/pom.xml | 7 +++--
spring-cache-providers/pom.xml | 8 +++--
.../spring-cache-ehcache/pom.xml | 4 +--
.../spring-cache-hashmap/pom.xml | 4 +--
.../spring-cache-oscache/pom.xml | 4 +--
spring-cache-providers/src/site/site.xml | 2 +-
spring-cache-test/pom.xml | 8 +++--
src/site/site.xml | 18 +++++++----
src/site/xdoc/{index.xml => index.xml.vm} | 7 +++++
10 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6896174..0889c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
<version>2.5-SNAPSHOT</version>
- <relativePath>../redback-components-parent/pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache</artifactId>
@@ -32,20 +32,22 @@
<packaging>pom</packaging>
<description>Cache API with various implementations : simple HashMap,
ehcache, oscache. Based on Spring container.</description>
-
- <url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
+ <url>${webUrl}/spring-cache/</url>
+ <properties>
+
<scmBrowseUrl>https://gitbox.apache.org/repos/asf?a=tree;p=archiva-redback-components-spring-cache.git</scmBrowseUrl>
+ </properties>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/${project.artifactId}</url>
+ <url>${siteUrl}/spring-cache/</url>
</site>
</distributionManagement>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-cache/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-cache</developerConnection>
-
<url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/</url>
+
<connection>scm:git:http://gitbox.apache.org/repos/asf/archiva-redback-components-spring-cache.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-cache.git</developerConnection>
+ <url>${scmBrowseUrl}</url>
</scm>
<modules>
@@ -59,5 +61,22 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
-
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/spring-cache-api/pom.xml b/spring-cache-api/pom.xml
index 0ebab3f..e377d18 100644
--- a/spring-cache-api/pom.xml
+++ b/spring-cache-api/pom.xml
@@ -33,14 +33,17 @@
<description>Common Cache API.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${webUrl}/spring-cache/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${siteUrl}/spring-cache/${project.artifactId}</url>
</site>
</distributionManagement>
+ <scm>
+ <url>${scmBrowseUrl};f=${project.artifactId}</url>
+ </scm>
<dependencies>
<dependency>
diff --git a/spring-cache-providers/pom.xml b/spring-cache-providers/pom.xml
index badfcd4..df034d5 100644
--- a/spring-cache-providers/pom.xml
+++ b/spring-cache-providers/pom.xml
@@ -30,15 +30,19 @@
<description>Commons Cache API Providers Parent Pom.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${webUrl}/spring-cache/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${siteUrl}/spring-cache/${project.artifactId}</url>
</site>
</distributionManagement>
+ <scm>
+ <url>${scmBrowseUrl};f=${project.artifactId}</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
diff --git a/spring-cache-providers/spring-cache-ehcache/pom.xml
b/spring-cache-providers/spring-cache-ehcache/pom.xml
index ccb3d21..1f10219 100644
--- a/spring-cache-providers/spring-cache-ehcache/pom.xml
+++ b/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -33,12 +33,12 @@
<description>Commons Cache API : ehcache implementation.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${siteUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
</site>
</distributionManagement>
diff --git a/spring-cache-providers/spring-cache-hashmap/pom.xml
b/spring-cache-providers/spring-cache-hashmap/pom.xml
index c5928b0..223ecaa 100644
--- a/spring-cache-providers/spring-cache-hashmap/pom.xml
+++ b/spring-cache-providers/spring-cache-hashmap/pom.xml
@@ -33,12 +33,12 @@
<description>Commons Cache API : simple in memory HashMap
implementation.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${siteUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
</site>
</distributionManagement>
diff --git a/spring-cache-providers/spring-cache-oscache/pom.xml
b/spring-cache-providers/spring-cache-oscache/pom.xml
index c8d38ce..6400bfb 100644
--- a/spring-cache-providers/spring-cache-oscache/pom.xml
+++ b/spring-cache-providers/spring-cache-oscache/pom.xml
@@ -28,12 +28,12 @@
<description>Commons Cache API : oscache implementation.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/spring-cache-providers/${project.artifactId}</url>
+
<url>${siteUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
</site>
</distributionManagement>
diff --git a/spring-cache-providers/src/site/site.xml
b/spring-cache-providers/src/site/site.xml
index a2f1d5f..4d28055 100644
--- a/spring-cache-providers/src/site/site.xml
+++ b/spring-cache-providers/src/site/site.xml
@@ -19,7 +19,7 @@
-->
<project name="Spring Cache Component">
- <publishDate format="dd MMM yyyy" position="left" />
+ <publishDate format="dd MMM yyyy" position="none" />
<version position="left" />
<body>
<menu ref="parent" />
diff --git a/spring-cache-test/pom.xml b/spring-cache-test/pom.xml
index 49df06a..418a98a 100644
--- a/spring-cache-test/pom.xml
+++ b/spring-cache-test/pom.xml
@@ -30,15 +30,19 @@
<description>Commons Test Cache API.</description>
-
<url>http://archiva.apache.org/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${webUrl}/spring-cache/${project.artifactId}</url>
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/spring-cache/${project.artifactId}</url>
+ <url>${siteUrl}/spring-cache/${project.artifactId}</url>
</site>
</distributionManagement>
+ <scm>
+ <url>${scmBrowseUrl};f=${project.artifactId}</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
diff --git a/src/site/site.xml b/src/site/site.xml
index a2f1d5f..1fc4dc6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -8,7 +8,7 @@
~ "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
+ ~ 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
@@ -17,12 +17,18 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project name="Spring Cache Component">
- <publishDate format="dd MMM yyyy" position="left" />
- <version position="left" />
+<project name="Spring Cache Component" >
+
+ <publishDate format="yyyy-MM-dd" position="none" />
+
<body>
- <menu ref="parent" />
<menu ref="modules" />
+ <menu ref="reports" />
+ <menu ref="ASF" />
+ <breadcrumbs>
+ <item name="Redback Components" href="../index.html" />
+ <item name="Spring Cache" href="index.html" />
+ </breadcrumbs>
</body>
</project>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml.vm
similarity index 93%
rename from src/site/xdoc/index.xml
rename to src/site/xdoc/index.xml.vm
index 27ad348..c4c864f 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml.vm
@@ -55,5 +55,12 @@ cacheBuilder.getCache( Wine.class )
</p>
</subsection>
</section>
+ <section name="Submodules" >
+ <ul>
+#foreach( $module in $project.modules )
+ <li><a href="$module/index.html">$module</a></li>
+#end
+ </ul>
+ </section>
</body>
</document>
--
To stop receiving notification emails like this one, please contact
marti...@apache.org.
