Adding links for developer reference docu
diff --git a/deploySite.sh b/deploySite.sh
index 9c27114..663445f 100755
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -28,19 +28,14 @@
THIS_DIR=$(readlink -f ${THIS_DIR})
CONTENT_DIR=".site-content"
BRANCH="asf-staging-3.0"
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+PUBLISH_PATH=$(mvn help:evaluate -Dexpression=scmPublishPath -q -DforceStdout)
+BRANCH=$(mvn help:evaluate -Dexpression=scmPublishBranch -q -DforceStdout)
+CONTENT_DIR=$(mvn help:evaluate -Dexpression=scmPubCheckoutDirectory -q -DforceStdout)
-if grep -q '<scmPublishBranch>' pom.xml; then
- BRANCH=$(sed -n -e 's/.*<scmPublishBranch>\(.*\)<\/scmPublishBranch>.*/\1/p' pom.xml)
-fi
-
-if grep -q '<scmPubCheckoutDirectory>' pom.xml; then
- CONTENT_DIR=$(sed -n -e 's/.*<scmPubCheckoutDirectory>\(.*\)<\/scmPubCheckoutDirectory>.*/\1/p' pom.xml)
-fi
-
-
-SUB_DIR=""
if [ -d "${CONTENT_DIR}/.git" ]; then
+ git -C "${CONTENT_DIR}" checkout ${BRANCH}
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
git -C "${CONTENT_DIR}" clean -f -d
@@ -53,7 +48,7 @@
echo "*****************************************"
echo ">>>> Finished the site stage process <<<<"
echo "> You can check the content in the folder target/staging or by opening the following url"
-echo "> file://${THIS_DIR}/target/staging${SUB_DIR}/index.html"
+echo "> file://${THIS_DIR}/target/staging${PUBLISH_PATH}/index.html"
echo "> "
echo "> If everything is fine enter yes. After that the publish process will be started."
echo -n "Do you want to publish (yes/no)? "
diff --git a/pom.xml b/pom.xml
index 7f6ef58..6e606e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,23 +41,25 @@
<archivaReleaseVersion>2.2.4</archivaReleaseVersion>
<archivaReleaseDate>30th April 2019</archivaReleaseDate>
<archivaCurrentDevVersion>3.0.0-SNAPSHOT</archivaCurrentDevVersion>
+ <redbackCurrentDevVersion>3.0.0-SNAPSHOT</redbackCurrentDevVersion>
<supportedVersions></supportedVersions>
<unsupportedVersions>1.X</unsupportedVersions>
- <siteUrl>http://archiva.apache.org/</siteUrl>
+ <siteUrl>https://archiva.apache.org/</siteUrl>
<site.cache.path>${user.home}</site.cache.path>
- <scmPubCheckoutDirectory>site-content</scmPubCheckoutDirectory>
<newUiDocVersion>${archivaReleaseVersion}</newUiDocVersion>
<siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
+ <scmPubCheckoutDirectory>site-content</scmPubCheckoutDirectory>
<scmPublishBranch>asf-staging</scmPublishBranch>
+ <scmPublishPath>/</scmPublishPath>
</properties>
<organization>
<name>The Apache Software Foundation</name>
- <url>http://archiva.apache.org/</url>
+ <url>https://archiva.apache.org/</url>
</organization>
<scm>
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 18bc1bc..cabfde4 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -1,6 +1,29 @@
body {
padding-top: 1px;
}
+/*
+ * 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.
+ */
+
+a.externalLink[href^="http"] {
+ background: url('../images/external-link-12x12.png') right center no-repeat;
+ padding-right: 18px;
+}
a.externalLink[href^="https"] {
background: url('../images/external-link-12x12.png') right center no-repeat;
diff --git a/src/site/site.xml b/src/site/site.xml
index 8c2f8b1..519b154 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -77,8 +77,8 @@
<item name="Mailing Lists" href="/mailing-lists.html"/>
<item name="Security" href="/security.html"/>
<item name="Documentation" href="">
- <item name="Release ${archivaReleaseVersion}" href="http://archiva.apache.org/docs/${archivaReleaseVersion}/"/>
- <item name="Dev ${archivaCurrentDevVersion}" href="http://archiva.apache.org/docs/${archivaCurrentDevVersion}/"/>
+ <item name="Release ${archivaReleaseVersion}" href="https://archiva.apache.org/docs/${archivaReleaseVersion}/"/>
+ <item name="Dev ${archivaCurrentDevVersion}" href="https://archiva.apache.org/docs/${archivaCurrentDevVersion}/"/>
</item>
</menu>
@@ -86,8 +86,16 @@
<item name="Build Apache Archiva" href="developers/building.html"/>
<item name="Get involved" href="/get-involved.html"/>
<item name="How we do things" href="developers/how-we-do-things.html"/>
- <item name="Redback" href="redback"/>
- <item name="Archiva Components" href="components"/>
+ <item name="Developer Reference">
+ <item name="Archiva ${archivaReleaseVersion}"
+ href="https://archiva.apache.org/ref/${archivaReleaseVersion}/index.html"/>
+ <item name="Archiva ${archivaCurrentDevVersion}"
+ href="https://archiva.apache.org/ref/${archivaCurrentDevVersion}/index.html"/>
+ <item name="Redback ${redbackCurrentDevVersion}"
+ href="https://archiva.apache.org/redback/core/${redbackCurrentDevVersion}/index.html"/>
+ </item>
+ <item name="Redback" href="redback/index.html"/>
+ <item name="Archiva Components Project" href="components/index.html"/>
<item name="Javascript application Architecture" href="/jsui/index.html">
<item name="Rest service" href="/jsui/rest.html"/>
<item name="JS Template loading" href="/jsui/template-loading.html"/>
@@ -100,10 +108,10 @@
</menu>
<menu name="ASF" inherit="bottom">
- <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
- <item name="Foundation" href="http://www.apache.org/foundation/"/>
- <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
</menu>
<breadcrumbs>
@@ -113,7 +121,7 @@
<footer>
<