Skip to content
Permalink
Browse files
Updating site generation
  • Loading branch information
effrafax committed Nov 24, 2019
1 parent 464bf7c commit 90ef91aa2d0f2278e19a6fbcaeb1f42d17e27d9c
Showing 15 changed files with 48 additions and 44 deletions.
@@ -27,12 +27,13 @@
THIS_DIR=$(dirname $0)
THIS_DIR=$(readlink -f ${THIS_DIR})
CONTENT_DIR=".site-content"
BRANCH="asf-staging-3.0"

SUB_DIR="components"

if [ -d "${CONTENT_DIR}/.git" ]; then
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
fi

echo ">>>> Creating site and reports <<<<"
@@ -55,7 +56,7 @@ else
echo "> Aborting now"
echo "> Running git reset in .site-content directory"
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
echo ">>>> Finished <<<<"
fi

@@ -52,6 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -1 +1 @@
/redback/components
/components
@@ -49,6 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
68 pom.xml
@@ -50,7 +50,7 @@


<properties>
<site.staging.base>${project.basedir}</site.staging.base>
<site.staging.base>${project.basedir}/target/staging/components</site.staging.base>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<webUrl>https://archiva.apache.org/components</webUrl>
<scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
@@ -270,20 +270,12 @@
<goals>clean deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
<checkinComment>${project.name}</checkinComment>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>

<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
@@ -293,6 +285,30 @@
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<configuration>
<notimestamp>true</notimestamp>
<javadocVersion>${javaFullVersion}</javadocVersion>
<source>${compiler.source}</source>
<doclint>none</doclint>
<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
<linksource>true</linksource>
<show>protected</show>
<quiet>true</quiet>
<tags>
<tag>
<name>todo</name>
<placement>a</placement>
<head>To Do:</head>
</tag>
</tags>
</configuration>
</plugin>

</plugins>
</pluginManagement>
<plugins>
@@ -336,10 +352,11 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
<checkinComment>Apache Archiva Component docs for ${project.version}</checkinComment>
<skipDeletedFiles>true</skipDeletedFiles>
<content>${project.build.directory}/staging</content>
<tryUpdate>true</tryUpdate>
<scmBranch>asf-staging-3.0</scmBranch>
<!--
<ignorePathsToDelete>
<path>%regex[^(?!docs/).*$]</path>
@@ -370,6 +387,7 @@
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
<skipDeploy>true</skipDeploy>
<stagingDirectory>${site.staging.base}/target/staging/components</stagingDirectory>
<asciidoc>
<!-- optional site-wide AsciiDoc attributes -->
<attributes>
@@ -417,20 +435,11 @@
<javadocVersion>${javaFullVersion}</javadocVersion>
<source>${compiler.source}</source>
<doclint>none</doclint>
<links>
<link>https://docs.oracle.com/javase/8/docs/api</link>
<link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
<link>http://commons.apache.org/dbcp/apidocs/</link>
<link>http://commons.apache.org/fileupload/apidocs/</link>
<link>http://commons.apache.org/httpclient/apidocs/</link>
<link>http://commons.apache.org/logging/apidocs/</link>
<link>http://commons.apache.org/pool/apidocs/</link>
<link>http://logging.apache.org/log4j/${log4j.version}/apidocs/</link>
<link>http://jakarta.apache.org/regexp/apidocs/</link>
</links>

<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
<linksource>true</linksource>
<show>private</show>
<show>protected</show>
<quiet>true</quiet>
<tags>
<tag>
<name>todo</name>
@@ -456,19 +465,6 @@
<profile>
<id>release</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<skipDeploy>true</skipDeploy>
<stagingDirectory>${site.staging.base}/target/staging/components/</stagingDirectory>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,6 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -55,6 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -32,7 +32,7 @@

<name>Archiva Components :: Spring Cache API</name>
<properties>
<site.staging.base>${project.parent.basedir}</site.staging.base>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties>
<description>Common Cache API.</description>

@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<description>Commons Cache API Providers Parent Pom.</description>
<properties>
<site.staging.base>${project.parent.basedir}</site.staging.base>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties>
<url>${webUrl}/spring-cache/${project.artifactId}</url>

@@ -33,7 +33,7 @@

<description>Commons Cache API : ehcache implementation.</description>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties>

<url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
@@ -34,7 +34,7 @@

<description>Commons Cache API : simple in memory HashMap implementation.</description>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties>

<url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
@@ -31,7 +31,7 @@

<description>Commons Test Cache API.</description>
<properties>
<site.staging.base>${project.parent.basedir}</site.staging.base>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties>

<url>${webUrl}/spring-cache/${project.artifactId}</url>
@@ -110,6 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -89,6 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -99,6 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>

0 comments on commit 90ef91a

Please sign in to comment.