releng: some fixes to the site
establish inheritance from FileVault Parent
diff --git a/README.md b/README.md
index 7567bf4..a23be66 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+[![ASF Jira](https://img.shields.io/badge/ASF%20JIRA-JCRVLT-orange)](https://issues.apache.org/jira/projects/JCRVLT/summary)
+![GitHub](https://img.shields.io/github/license/apache/jackrabbit-filevault-package-maven-plugin)
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.jackrabbit/filevault-package-maven-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.jackrabbit/filevault-package-maven-plugin)
[![Build Status](https://travis-ci.org/apache/jackrabbit-filevault-package-maven-plugin.svg?branch=trunk)](https://travis-ci.org/apache/jackrabbit-filevault-package-maven-plugin)
Welcome to Apache Jackrabbit FileVault Package Maven Plugin
@@ -13,7 +16,7 @@
Documentation
=============
Please refer to the plugin documentation at
-http://jackrabbit.apache.org/filevault-package-maven-plugin/index.html
+<https://jackrabbit.apache.org/filevault-package-maven-plugin/index.html>
Building the FileVault Package Maven Plugin
@@ -26,7 +29,7 @@
You need Maven 3.3.9 (or higher) with Java 8 (or higher) for the build.
For more instructions, please see the documentation at:
- http://jackrabbit.apache.org/building-jackrabbit.html
+ <https://jackrabbit.apache.org/building-jackrabbit.html>
License (see also LICENSE)
==============================
@@ -57,7 +60,7 @@
look at our website and joining our mailing lists. For more details about
Jackrabbit mailing lists as well as links to list archives, please see:
- http://jackrabbit.apache.org/mailing-lists.html
+ <https://jackrabbit.apache.org/mailing-lists.html>
Latest development
==================
@@ -70,5 +73,5 @@
Credits
=======
-See http://jackrabbit.apache.org/jackrabbit-team.html for the list of
+See <https://jackrabbit.apache.org/jackrabbit-team.html> for the list of
Jackrabbit committers and main contributors.
diff --git a/pom.xml b/pom.xml
index fcbb926..02c5534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
<!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>23</version>
- <relativePath />
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>parent</artifactId>
+ <relativePath></relativePath>
+ <version>3.4.5-SNAPSHOT</version>
</parent>
<!-- ====================================================================== -->
@@ -39,14 +39,10 @@
<description>Maven Plugin supporting creation of content packages.</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.3.9</maven.version> <!-- required for https://issues.apache.org/jira/browse/MNG-5440 -->
<aether.version>1.0.2.v20150114</aether.version>
<slf4j.version>1.7.5</slf4j.version>
- <jackrabbit.version>2.20.0</jackrabbit.version>
- <oak.version>1.20.0</oak.version>
- <filevault.version>3.4.5-SNAPSHOT</filevault.version>
- <surefire.version>2.22.2</surefire.version>
+ <filevault.version>${project.parent.version}</filevault.version> <!-- must be equal to parent version -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.outputTimestamp>2020-01-22T15:10:38Z</project.build.outputTimestamp>
@@ -66,32 +62,6 @@
<tag>trunk</tag>
</scm>
- <!-- ====================================================================== -->
- <!-- P R O J E C T I N F O -->
- <!-- ====================================================================== -->
- <mailingLists>
- <mailingList>
- <name>Jackrabbit Developer List</name>
- <subscribe>dev-subscribe@jackrabbit.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@jackrabbit.apache.org</unsubscribe>
- <post>mailto:dev@jackrabbit.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/jackrabbit-dev/</archive>
- </mailingList>
-
- <mailingList>
- <name>Jackrabbit User List</name>
- <subscribe>users-subscribe@jackrabbit.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@jackrabbit.apache.org</unsubscribe>
- <post>mailto:users@jackrabbit.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/jackrabbit-users/</archive>
- </mailingList>
- </mailingLists>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/JCRVLT</url>
- </issueManagement>
-
<ciManagement>
<system>Travis</system>
<url>https://travis-ci.org/apache/jackrabbit-filevault-package-maven-plugin</url>
@@ -107,14 +77,6 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.0</version>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.9.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -145,18 +107,6 @@
</pluginManagement>
<plugins>
<!-- ====================================================================== -->
- <!-- C O M P I L E R P L U G I N -->
- <!-- ====================================================================== -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <showDeprecation>false</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>false</optimize>
- </configuration>
- </plugin>
- <!-- ====================================================================== -->
<!-- M A V E N P L U G I N -->
<!-- ====================================================================== -->
<plugin>
@@ -332,18 +282,15 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
</dependency>
<!-- only a transitive dependency but must be declared due to https://issues.apache.org/jira/browse/JCRVLT-394 -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
- <version>${oak.version}</version>
</dependency>
<!-- Maven Plugin stuff -->
<dependency>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 9b8125a..333c67e 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -20,17 +20,17 @@
Welcome to Apache Jackrabbit FileVault Package Maven Plugin.
-The Apache Jackrabbit FileVault package maven plugin is an Apache maven plugin that simplifies the creation of
-content package maven artifacts. The content packages can later be used to install content into a JCR repository
+The Apache Jackrabbit FileVault Package Maven plugin is an Apache Maven plugin that simplifies the creation of
+content package Maven artifacts. The content packages can later be used to install content into a JCR repository
using the Apache Jackrabbit FileVault packaging runtime.
Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
Downloads
---------
-The latest filevault package plugin sources are available for checkout from [svn](https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk), or you can [fork them](https://github.com/apache/jackrabbit-filevault-package-maven-plugin) on GitHub.
+The latest FileVault Package Maven Plugin sources are available at <https://github.com/apache/jackrabbit-filevault-package-maven-plugin>.
-See also our [releases](http://jackrabbit.apache.org/downloads.html) on the Jackrabbit
+See also our [releases](https://jackrabbit.apache.org/downloads.html) on the Jackrabbit
download page for slightly more stable versions of the codebase.
Mailing Lists
@@ -48,5 +48,5 @@
Credits
-------
-See http://jackrabbit.apache.org/jackrabbit-team.html for the list of
+See <https://jackrabbit.apache.org/jackrabbit-team.html> for the list of
Jackrabbit committers and main contributors.
diff --git a/src/site/resources/asf_logo.png b/src/site/resources/asf_logo.png
new file mode 100644
index 0000000..94f91cf
--- /dev/null
+++ b/src/site/resources/asf_logo.png
Binary files differ
diff --git a/src/site/resources/favicon.ico b/src/site/resources/favicon.ico
new file mode 100644
index 0000000..6f05b3b
--- /dev/null
+++ b/src/site/resources/favicon.ico
Binary files differ
diff --git a/src/site/resources/jackrabbit.png b/src/site/resources/jackrabbit.png
new file mode 100644
index 0000000..bacda55
--- /dev/null
+++ b/src/site/resources/jackrabbit.png
Binary files differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 4ede4c5..4814cd7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,12 +17,13 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"
name="Jackrabbit FileVault Package Maven Plugin">
-
- <edit>${project.scm.url}</edit>
<body>
+ <breadcrumbs>
+ <item name="Jackrabbit FileVault Package Maven Plugin" href="http://maven.apache.org/plugins/maven-release-plugin/index.html" />
+ </breadcrumbs>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Goals" href="plugin-info.html"/>
@@ -49,19 +50,11 @@
<item href="http://jackrabbit.apache.org/filevault-package-maven-plugin-archives/1.0.1" name="1.0.1"/>
<item href="http://jackrabbit.apache.org/filevault-package-maven-plugin-archives/1.0.0" name="1.0.0"/>
</menu>
+
</body>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
-
<custom>
<fluidoSkin>
- <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
- <topBarEnabled>true</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
<gitHub>
<projectId>apache/jackrabbit-filevault-package-maven-plugin</projectId>
<ribbonOrientation>right</ribbonOrientation>
@@ -69,7 +62,6 @@
<ohloh>
<projectId>jackrabbit-filevault-package-maven-plugin</projectId>
</ohloh>
- <googlePlusOne/>
</fluidoSkin>
</custom>
</project>