Merge lp:~zorba-coders/zorba/bump-3.0 into lp:zorba

[Chris Hillery]

Bump version to 3.0!

[Chris Hillery (ceejatec)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262

Stage "TestZorbaUbuntu" failed.
2 tests failed (8576 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/399/testReport/ to view the results.

[lp:~zorba-coders/zorba/bump-3.0]

11670. By Chris Hillery on 2013-10-30

Update zorba-version test cases.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-27 15:31:16 +0000
+++ CMakeLists.txt	2013-10-30 15:49:53 +0000
@@ -486,9 +486,9 @@
 INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # zorba versioning
-SET(ZORBA_MAJOR_NUMBER "2")
-SET(ZORBA_MINOR_NUMBER "9")
-SET(ZORBA_PATCH_NUMBER "1")
+SET(ZORBA_MAJOR_NUMBER "3")
+SET(ZORBA_MINOR_NUMBER "0")
+SET(ZORBA_PATCH_NUMBER "0")
 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
 

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2013-09-18 18:51:34 +0000
+++ NOTICE.txt	2013-10-30 15:49:53 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.9.1
+Zorba 3.0.0
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'modules/sctx/sctx.jq'
--- modules/sctx/sctx.jq	2013-10-01 17:55:40 +0000
+++ modules/sctx/sctx.jq	2013-10-30 15:49:53 +0000
@@ -23,7 +23,7 @@
  :
  : @see http://www.w3.org/TR/xquery/#id-xq-static-context-components
  : @author Nicolae Brinza
- : @project Zorba/Static Context
+ : @project Zorba/Introspection/Static Context/Static Context
  :)
 module namespace sctx = "http://zorba.io/modules/sctx";
 

=== modified file 'modules/sequence/sequence.xq'
--- modules/sequence/sequence.xq	2013-10-01 23:33:19 +0000
+++ modules/sequence/sequence.xq	2013-10-30 15:49:53 +0000
@@ -22,7 +22,7 @@
  : This module provides an XQuery API to perform set operations on sequences.
  :
  : @author Paul J. Lucas
- : @project Zorba/Sequence
+ : @project Zorba/XML and JSON Data Model/Sequence/Sequence
  :)
 
 module namespace seq = "http://zorba.io/modules/sequence";

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version1.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version1.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version1.xq	2013-10-30 15:49:53 +0000
@@ -1,6 +1,6 @@
 (: test that a query can declare a Zorba version it requires :)
 
 declare namespace ver = "http://zorba.io/options/versioning";
-declare option ver:zorba-version "2.0";
+declare option ver:zorba-version "3.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version6.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version6.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version6.xq	2013-10-30 15:49:53 +0000
@@ -1,6 +1,6 @@
 (: test for declaring Zorba version including patch number :)
 
 declare namespace ver = "http://zorba.io/options/versioning";
-declare option ver:zorba-version "2.0.0";
+declare option ver:zorba-version "3.0.0";
 
 1+1