This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new b2c756d72 fix website deployment
b2c756d72 is described below
commit b2c756d72ec657b579f79b2fd0b1e8e63d60cf4a
Author: Olivier Lamy <[email protected]>
AuthorDate: Sat Apr 23 14:39:46 2022 +1000
fix website deployment
Signed-off-by: Olivier Lamy <[email protected]>
---
deploySite.sh | 3 ++-
pom.xml | 43 ++++++-----------------------------------
website/0.9.9/src/site/site.xml | 32 ++++++------------------------
website/1.0.2/src/site/site.xml | 38 ++++++++----------------------------
website/1.0.3/pom.xml | 4 ++--
website/1.0.3/src/site/site.xml | 35 ++++++++++-----------------------
website/deploySite.sh | 3 ++-
website/pom.xml | 21 +++++++++++++++-----
website/src/site/site.xml | 25 +++++++++++++++---------
9 files changed, 68 insertions(+), 136 deletions(-)
diff --git a/deploySite.sh b/deploySite.sh
index 8abe7906a..6398c40b1 100644
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -21,4 +21,5 @@
read -s -p "Enter Apache Username: " myusername
echo ""
read -s -p "Enter Apache Password: " mypassword
-mvn clean site-deploy scm-publish:publish-scm -Dusername=$myusername
-Dpassword=$mypassword -DskipTests $@
+mvn -Preporting site site:stage $@
+mvn scm-publish:publish-scm -Dusername="$myusername" -Dpassword="$mypassword"
-DskipTests $@
diff --git a/pom.xml b/pom.xml
index 89090f8ce..09c92962d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,18 +394,9 @@
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>
- <svnkit.version>1.7.11</svnkit.version>
-
-
<helix.siteFilePath>${user.home}/helix-site/helix-site-deploy</helix.siteFilePath>
- <!-- you can use javasvn too -->
- <svnImpl>svn</svnImpl>
-
<helix.siteUrlDeployment>file://${helix.siteFilePath}</helix.siteUrlDeployment>
-
<helix.scmPubCheckoutDirectory>${user.home}/helix-site/helix-site-content</helix.scmPubCheckoutDirectory>
- <scmSkipDeletedFiles>false</scmSkipDeletedFiles>
<!-- fix issue with current apache parent pom -->
<arguments />
- <!-- for svnpubsub site deployment -->
<helix.release.preparationGoals>clean
install</helix.release.preparationGoals>
<helix.release.performGoals>deploy</helix.release.performGoals>
<helix.release.arguments>-Papache-release
-DskipTests</helix.release.arguments>
@@ -442,7 +433,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${helix.siteUrlDeployment}</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/helix/site-content/</url>
</site>
</distributionManagement>
@@ -625,28 +616,6 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.8</version>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <tryUpdate>true</tryUpdate>
- <providerImplementations>
- <svn>${svnImpl}</svn>
- </providerImplementations>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/helix/site-content/</pubScmUrl>
- <content>${helix.siteFilePath}</content>
-
<checkoutDirectory>${helix.scmPubCheckoutDirectory}</checkoutDirectory>
- <skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <version>${svnkit.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -879,11 +848,11 @@
<violationSeverity>error</violationSeverity>
</configuration-->
</plugin>
- <plugin>
- <groupId>org.codehaus.sonar-plugins</groupId>
- <artifactId>maven-report</artifactId>
- <version>0.1</version>
- </plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.codehaus.sonar-plugins</groupId>-->
+<!-- <artifactId>maven-report</artifactId>-->
+<!-- <version>0.1</version>-->
+<!-- </plugin>-->
</plugins>
</reporting>
diff --git a/website/0.9.9/src/site/site.xml b/website/0.9.9/src/site/site.xml
index b66a28c0d..0470650e0 100644
--- a/website/0.9.9/src/site/site.xml
+++ b/website/0.9.9/src/site/site.xml
@@ -30,33 +30,13 @@
<publishDate position="right"/>
- <skin>
- <groupId>lt.velykis.maven.skins</groupId>
- <artifactId>reflow-maven-skin</artifactId>
- <version>1.0.0</version>
- </skin>
<body>
- <head><![CDATA[
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-3211522-12']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
- })();
-
- </script>
- ]]></head>
<breadcrumbs position="left">
- <item name="Apache Helix" href="http://helix.apache.org/"/>
- <item name="Release 0.9.9" href="http://helix.apache.org/0.9.9-docs/"/>
+ <item name="Apache Helix" href="https://helix.apache.org/"/>
+ <item name="Release 0.9.9" href="https://helix.apache.org/0.9.9-docs/"/>
</breadcrumbs>
<links>
@@ -72,7 +52,7 @@
<menu name="Hands-On">
<item name="Quick Start" href="./Quickstart.html"/>
<item name="Tutorial" href="./Tutorial.html"/>
- <item name="Javadocs" href="http://helix.apache.org/javadocs/0.9.9"/>
+ <item name="Javadocs" href="https://helix.apache.org/javadocs/0.9.9"/>
</menu>
<menu name="Recipes">
@@ -111,7 +91,7 @@
<highlightJs>false</highlightJs>
<brand>
<name>Apache Helix</name>
- <href>http://helix.apache.org</href>
+ <href>https://helix.apache.org</href>
</brand>
<slogan>A cluster management framework for partitioned and replicated
distributed resources</slogan>
<bottomNav>
@@ -127,7 +107,7 @@
</index>
</pages>
</reflowSkin>
- <!--fluidoSkin>
+ <fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
<googleSearch></googleSearch>
@@ -136,7 +116,7 @@
<showUser>true</showUser>
<showFollowers>false</showFollowers>
</twitter>
- </fluidoSkin-->
+ </fluidoSkin>
</custom>
</project>
diff --git a/website/1.0.2/src/site/site.xml b/website/1.0.2/src/site/site.xml
index 6a6c05292..ebab09afe 100644
--- a/website/1.0.2/src/site/site.xml
+++ b/website/1.0.2/src/site/site.xml
@@ -20,43 +20,21 @@
<project name="Apache Helix">
<bannerLeft>
<src>../images/helix-logo.jpg</src>
- <href>http://helix.apache.org/</href>
+ <href>https://helix.apache.org/</href>
</bannerLeft>
<bannerRight>
<src>../images/feather_small.gif</src>
- <href>http://www.apache.org/</href>
+ <href>https://www.apache.org/</href>
</bannerRight>
<version position="none"/>
<publishDate position="right"/>
- <skin>
- <groupId>lt.velykis.maven.skins</groupId>
- <artifactId>reflow-maven-skin</artifactId>
- <version>1.0.0</version>
- </skin>
-
<body>
- <head><![CDATA[
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-3211522-12']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
- })();
-
- </script>
- ]]></head>
-
<breadcrumbs position="left">
- <item name="Apache Helix" href="http://helix.apache.org/"/>
- <item name="Release 1.0.2" href="http://helix.apache.org/1.0.2-docs/"/>
+ <item name="Apache Helix" href="https://helix.apache.org/"/>
+ <item name="Release 1.0.2" href="https://helix.apache.org/1.0.2-docs/"/>
</breadcrumbs>
<links>
@@ -72,7 +50,7 @@
<menu name="Hands-On">
<item name="Quick Start" href="./Quickstart.html"/>
<item name="Tutorial" href="./Tutorial.html"/>
- <item name="Javadocs" href="http://helix.apache.org/javadocs/1.0.2"/>
+ <item name="Javadocs" href="https://helix.apache.org/javadocs/1.0.2"/>
</menu>
<menu name="Recipes">
@@ -111,7 +89,7 @@
<highlightJs>false</highlightJs>
<brand>
<name>Apache Helix</name>
- <href>http://helix.apache.org</href>
+ <href>https://helix.apache.org</href>
</brand>
<slogan>A cluster management framework for partitioned and replicated
distributed resources</slogan>
<bottomNav>
@@ -127,7 +105,7 @@
</index>
</pages>
</reflowSkin>
- <!--fluidoSkin>
+ <fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
<googleSearch></googleSearch>
@@ -136,7 +114,7 @@
<showUser>true</showUser>
<showFollowers>false</showFollowers>
</twitter>
- </fluidoSkin-->
+ </fluidoSkin>
</custom>
</project>
diff --git a/website/1.0.3/pom.xml b/website/1.0.3/pom.xml
index cc21b9aba..13253e150 100644
--- a/website/1.0.3/pom.xml
+++ b/website/1.0.3/pom.xml
@@ -26,9 +26,9 @@
<version>1.0.4-SNAPSHOT</version>
</parent>
- <artifactId>1.0.4-docs</artifactId>
+ <artifactId>1.0.3-docs</artifactId>
<packaging>bundle</packaging>
- <name>Apache Helix :: Website :: 1.0.4</name>
+ <name>Apache Helix :: Website :: 1.0.3</name>
<properties>
</properties>
diff --git a/website/1.0.3/src/site/site.xml b/website/1.0.3/src/site/site.xml
index c0bedad33..5d59de455 100644
--- a/website/1.0.3/src/site/site.xml
+++ b/website/1.0.3/src/site/site.xml
@@ -30,33 +30,18 @@
<publishDate position="right"/>
- <skin>
- <groupId>lt.velykis.maven.skins</groupId>
- <artifactId>reflow-maven-skin</artifactId>
- <version>1.0.0</version>
- </skin>
+<!-- <skin>-->
+<!-- <groupId>lt.velykis.maven.skins</groupId>-->
+<!-- <artifactId>reflow-maven-skin</artifactId>-->
+<!-- <version>1.0.0</version>-->
+<!-- </skin>-->
<body>
- <head><![CDATA[
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-3211522-12']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
- })();
-
- </script>
- ]]></head>
<breadcrumbs position="left">
- <item name="Apache Helix" href="http://helix.apache.org/"/>
- <item name="Release 1.0.3" href="http://helix.apache.org/1.0.3-docs/"/>
+ <item name="Apache Helix" href="https://helix.apache.org/"/>
+ <item name="Release 1.0.3" href="https://helix.apache.org/1.0.3-docs/"/>
</breadcrumbs>
<links>
@@ -72,7 +57,7 @@
<menu name="Hands-On">
<item name="Quick Start" href="./Quickstart.html"/>
<item name="Tutorial" href="./Tutorial.html"/>
- <item name="Javadocs" href="http://helix.apache.org/javadocs/1.0.3"/>
+ <item name="Javadocs" href="https://helix.apache.org/javadocs/1.0.3"/>
</menu>
<menu name="Recipes">
@@ -127,7 +112,7 @@
</index>
</pages>
</reflowSkin>
- <!--fluidoSkin>
+ <fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
<googleSearch></googleSearch>
@@ -136,7 +121,7 @@
<showUser>true</showUser>
<showFollowers>false</showFollowers>
</twitter>
- </fluidoSkin-->
+ </fluidoSkin>
</custom>
</project>
diff --git a/website/deploySite.sh b/website/deploySite.sh
index 47d685f93..5429a5f4a 100755
--- a/website/deploySite.sh
+++ b/website/deploySite.sh
@@ -21,4 +21,5 @@
read -s -p "Enter Apache Username: " myusername
echo ""
read -s -p "Enter Apache Password: " mypassword
-mvn clean site-deploy scm-publish:publish-scm -Dusername="$myusername"
-Dpassword="$mypassword" -DskipTests $@
+mvn site site:stage $@
+mvn scm-publish:publish-scm -Dusername="$myusername" -Dpassword="$mypassword"
-DskipTests $@
diff --git a/website/pom.xml b/website/pom.xml
index 3158c4034..a7e1d5afd 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -29,7 +29,7 @@
<artifactId>website</artifactId>
<name>Apache Helix :: Website</name>
- <url>http://helix.apache.org</url>
+ <url>https://helix.apache.org</url>
<modules>
<module>0.9.9</module>
@@ -38,10 +38,16 @@
</modules>
<properties>
+
+ <!-- for svnpubsub site deployment -->
+ <!-- you can use javasvn too -->
+ <svnImpl>svn</svnImpl>
<helix.siteFilePath>${user.home}/helix-site/helix-site-deploy</helix.siteFilePath>
-
<helix.siteUrlDeployment>file://${helix.siteFilePath}</helix.siteUrlDeployment>
+
<helix.siteUrlDeployment>scm:svn:https://svn.apache.org/repos/asf/helix/site-content/</helix.siteUrlDeployment>
<helix.scmPubCheckoutDirectory>${user.home}/helix-site/helix-site-content</helix.scmPubCheckoutDirectory>
<scmSkipDeletedFiles>false</scmSkipDeletedFiles>
+
<maven-scm-provider-svnjava.version>2.1.2</maven-scm-provider-svnjava.version>
+ <svnkit.version>1.7.11</svnkit.version>
</properties>
<distributionManagement>
@@ -69,11 +75,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.11.0</version>
<dependencies>
<dependency>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1</version>
</dependency>
</dependencies>
</plugin>
@@ -83,13 +90,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<tryUpdate>true</tryUpdate>
<providerImplementations>
<svn>${svnImpl}</svn>
</providerImplementations>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/helix/site-content/</pubScmUrl>
- <content>${helix.siteFilePath}</content>
<checkoutDirectory>${helix.scmPubCheckoutDirectory}</checkoutDirectory>
<skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
<ignorePathsToDelete>
@@ -100,6 +106,11 @@
</ignorePathsToDelete>
</configuration>
<dependencies>
+<!-- <dependency>-->
+<!--
<groupId>com.google.code.maven-scm-provider-svnjava</groupId>-->
+<!-- <artifactId>maven-scm-provider-svnjava</artifactId>-->
+<!-- <version>${maven-scm-provider-svnjava.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit</artifactId>
diff --git a/website/src/site/site.xml b/website/src/site/site.xml
index c23f8a939..a36e3a1d1 100644
--- a/website/src/site/site.xml
+++ b/website/src/site/site.xml
@@ -20,20 +20,26 @@
<project name="Apache Helix">
<bannerLeft>
<src>images/helix-logo.jpg</src>
- <href>http://helix.apache.org/</href>
+ <href>https://helix.apache.org/</href>
</bannerLeft>
<bannerRight>
<src>images/feather_small.gif</src>
- <href>http://www.apache.org/</href>
+ <href>https://www.apache.org/</href>
</bannerRight>
<publishDate position="none"/>
<version position="none"/>
+<!-- <skin>-->
+<!-- <groupId>lt.velykis.maven.skins</groupId>-->
+<!-- <artifactId>reflow-maven-skin</artifactId>-->
+<!-- <version>1.1.1</version>-->
+<!-- </skin>-->
+
<skin>
- <groupId>lt.velykis.maven.skins</groupId>
- <artifactId>reflow-maven-skin</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.11.0-SNAPSHOT</version>
</skin>
<body>
@@ -51,7 +57,8 @@
})();
</script>
- ]]></head>
+ ]]>
+ </head>
<breadcrumbs position="left">
<item name="Apache Helix" href="http://helix.apache.org/"/>
@@ -119,7 +126,7 @@
</body>
<custom>
- <!--fluidoSkin>
+ <fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<googleSearch></googleSearch>
<twitter>
@@ -128,14 +135,14 @@
<showFollowers>false</showFollowers>
</twitter>
<sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin-->
+ </fluidoSkin>
<reflowSkin>
<theme>site</theme>
<localResources>true</localResources>
<highlightJs>false</highlightJs>
<brand>
<name>Apache Helix</name>
- <href>http://helix.apache.org</href>
+ <href>https://helix.apache.org</href>
</brand>
<slogan>A cluster management framework for partitioned and replicated
distributed resources</slogan>
<bottomNav>
