You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2014/04/22 09:42:43 UTC
[1/3] git commit: site updates - fix deployment URL for sub-modules -
fix DISCLAIMER - improve release docs
Repository: incubator-vxquery
Updated Branches:
refs/heads/master 92302902f -> 4a93c7bae
site updates
- fix deployment URL for sub-modules
- fix DISCLAIMER
- improve release docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e22fbe0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e22fbe0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e22fbe0d
Branch: refs/heads/master
Commit: e22fbe0dc1b7b30423f9277f5ab4414fb9eaf6e5
Parents: d985326
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 22 00:34:48 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 22 00:34:48 2014 -0700
----------------------------------------------------------------------
DISCLAIMER | 2 +-
src/site/apt/release.apt | 45 ++++++++++++++++++++++++++++++------------
vxquery-benchmark/pom.xml | 2 +-
vxquery-cli/pom.xml | 2 +-
vxquery-core/pom.xml | 2 +-
vxquery-server/pom.xml | 2 +-
vxquery-xtest/pom.xml | 2 +-
7 files changed, 38 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
index e084821..a5e6a19 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,5 +1,5 @@
Apache VXQuery is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache XMLBeans PMC.
+Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making
process have stabilized in a manner consistent with other successful ASF
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/src/site/apt/release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
index 0ceb907..e25da31 100644
--- a/src/site/apt/release.apt
+++ b/src/site/apt/release.apt
@@ -17,18 +17,44 @@ Releasing Apache VXQuery
* One time steps
+ * set up directory structure
+
+ There usually are 3 directories at the same level
+
+ * the source directory <<<incubator-vxquery>>>,
+
+ * the <<<site>>> directory, and
+
+ * the distribution directory <<<dist>>>.
+
+ The source directory is version-controlled by <<<git>>>, the other two
+ are version controlled by <<<svn>>>.
+ While the source directory and the distribution directory can have
+ arbitrary names and locations, the <<<site>>> directory has to be called
+ <<<site>>> and it needs to be at the same level as the source directory
+ to enable site deployment.
+
+ Assuming that the source directory is available one can create the
+ directory structure by going to the directory that contains the
+ source directory and checking out the distribution and site
+ directories:
+
+---
+$ svn co https://dist.apache.org/repos/dist/release/incubator/vxquery dist
+$ svn co https://svn.apache.org/repos/asf/incubator/vxquery/site
+---
+
* add your key to the <<<KEYS>>> file
+ Change into the <<<dist>>> directory and run
+
---
(gpg --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
---
- * check the new <<<KEYS>>> file into the VXQuery distribution directory
+ and then check the new <<<KEYS>>> file into svn
---
-$ svn co https://dist.apache.org/repos/dist/release/incubator/vxquery
-$ cd vxquery
-$ cp [path to KEYS file] .
$ svn ci -m "add [YOUR NAME]'s key to KEYS file"
---
@@ -121,15 +147,7 @@ $ mvn release:perform
* update the <<<site>>> branch in git from the from the release-tag
- * get site from svn (the site directory needs to be at <<<../site>>> from the git root directory)
-
----
-$ cd ..
-$ svn co https://svn.apache.org/repos/asf/incubator/vxquery/site
-$ cd -
----
-
- * build a new site
+ * build a new site and deploy it to <<<../site>>>
---
$ mvn site site:deploy
@@ -139,6 +157,7 @@ $ mvn site site:deploy
---
$ cd ../site
+$ svn add [all new files]
$ svn ci -m"updated site"
$ cd -
---
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index a909a78..bf70efb 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -32,7 +32,7 @@
<site>
<id>vxquery.website</id>
<name>VXQuery Website</name>
- <url>file:../../site/vxquery-benchmark/</url>
+ <url>file:../site/vxquery-benchmark/</url>
</site>
</distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 58631b8..e6153a1 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -32,7 +32,7 @@
<site>
<id>vxquery.website</id>
<name>VXQuery Website</name>
- <url>file:../../site/vxquery-cli/</url>
+ <url>file:../site/vxquery-cli/</url>
</site>
</distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index bc64f9b..f038fe1 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -32,7 +32,7 @@
<site>
<id>vxquery.website</id>
<name>VXQuery Website</name>
- <url>file:../../site/vxquery-core/</url>
+ <url>file:../site/vxquery-core/</url>
</site>
</distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 47665bb..ed77df4 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -32,7 +32,7 @@
<site>
<id>vxquery.website</id>
<name>VXQuery Website</name>
- <url>file:../../site/vxquery-server/</url>
+ <url>file:../site/vxquery-server/</url>
</site>
</distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e22fbe0d/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 76db7d9..dd9d058 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -32,7 +32,7 @@
<site>
<id>vxquery.website</id>
<name>VXQuery Website</name>
- <url>file:../../site/vxquery-xtest/</url>
+ <url>file:../site/vxquery-xtest/</url>
</site>
</distributionManagement>
[2/3] git commit: yet another small update to the release page
Posted by ti...@apache.org.
yet another small update to the release page
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/a73cca33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/a73cca33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/a73cca33
Branch: refs/heads/master
Commit: a73cca33d614c9d07af7aab9c4781226f7553f42
Parents: e22fbe0
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 22 00:41:19 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 22 00:41:19 2014 -0700
----------------------------------------------------------------------
src/site/apt/release.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a73cca33/src/site/apt/release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
index e25da31..931f12b 100644
--- a/src/site/apt/release.apt
+++ b/src/site/apt/release.apt
@@ -157,7 +157,7 @@ $ mvn site site:deploy
---
$ cd ../site
-$ svn add [all new files]
+$ svn st | awk '/\?/ { print $2 }' | xargs svn add # add all new files
$ svn ci -m"updated site"
$ cd -
---
[3/3] git commit: Merge branch 'site'
Posted by ti...@apache.org.
Merge branch 'site'
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/4a93c7ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/4a93c7ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/4a93c7ba
Branch: refs/heads/master
Commit: 4a93c7bae3d0071c79944feeb0d467ab03568d02
Parents: 9230290 a73cca3
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 22 00:42:04 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 22 00:42:04 2014 -0700
----------------------------------------------------------------------
DISCLAIMER | 2 +-
src/site/apt/release.apt | 45 ++++++++++++++++++++++++++++++------------
vxquery-benchmark/pom.xml | 2 +-
vxquery-cli/pom.xml | 2 +-
vxquery-core/pom.xml | 2 +-
vxquery-server/pom.xml | 2 +-
vxquery-xtest/pom.xml | 2 +-
7 files changed, 38 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4a93c7ba/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4a93c7ba/vxquery-cli/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4a93c7ba/vxquery-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4a93c7ba/vxquery-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4a93c7ba/vxquery-xtest/pom.xml
----------------------------------------------------------------------