Zorba

Merge lp:~zorba-coders/zorba/zorba-2.5-prep into lp:zorba

  1. zorba-2.5-prep
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10860
Merged at revision: 10863
Proposed branch: lp:~zorba-coders/zorba/zorba-2.5-prep
Merge into: lp:zorba
Diff against target: 154 lines (+39/-44)
4 files modified
CMakeLists.txt (+1/-1)
ChangeLog (+19/-24)
NOTICE.txt (+1/-1)
modules/ExternalModules.conf (+18/-18)
To merge this branch: bzr merge lp:~zorba-coders/zorba/zorba-2.5-prep
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+106728@code.launchpad.net

Commit message

Update changelog, update module tags for Zorba 2.5.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote :

I have tagged all branches with "zorba-2.5".

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-2.5-prep-2012-05-22T02-22-50.034Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job zorba-2.5-prep-2012-05-22T02-22-50.034Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-2.5-prep-2012-05-22T15-22-58.812Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/zorba-2.5-prep into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job zorba-2.5-prep-2012-05-22T15-22-58.812Z is finished.
  The final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-2.5-prep-2012-05-22T16-23-29.204Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job zorba-2.5-prep-2012-05-22T16-23-29.204Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-05-17 09:43:03 +0000
3+++ CMakeLists.txt 2012-05-22 01:13:22 +0000
4@@ -438,7 +438,7 @@
5
6 # zorba versioning
7 SET(ZORBA_MAJOR_NUMBER "2")
8-SET(ZORBA_MINOR_NUMBER "2")
9+SET(ZORBA_MINOR_NUMBER "5")
10 SET(ZORBA_PATCH_NUMBER "0")
11 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
12 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
13
14=== modified file 'ChangeLog'
15--- ChangeLog 2012-05-21 18:29:36 +0000
16+++ ChangeLog 2012-05-22 01:13:22 +0000
17@@ -1,16 +1,9 @@
18 Zorba - The XQuery Processor
19
20-
21-version 2.x
22-
23- * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
24- * Fixed bug #1001463 (type not available during computation of function caching)
25-
26-
27 version 2.5
28
29 New Features:
30- * XQuery 3.0 functions
31+ * New XQuery 3.0 functions
32 - fn:available-environment-variables
33 - fn:environment-variables
34 - fn:uri-collection
35@@ -20,30 +13,33 @@
36 - fn:nilled#0
37 - fn:path
38 * Added base64:decode#2 function which also does transcoding
39- * Extended API for Python, Java, PHP and Ruby.
40- * Add jvm classpath to zorbacmd and to Zorba API. Tracked by #931816
41- * Added full-text module.
42+ * Extended API for Python, Java, PHP and Ruby
43+ * Added JVM classpath to zorbacmd and to Zorba API
44+ * Added full-text module
45 * Added support for NO_ICU (to not use ICU for unicode processing)
46- * Added XQJ support.
47- * Added CollectionManager and DocumentManager support for XQJ.
48- * New API EntityKind SOME_CONTENT
49- * API StreamResource is able to specify whether a stream is seekable
50- * New functions in the fetch module and the StaticContext to fetch
51+ * Added XQJ support
52+ * Added CollectionManager and DocumentManager support for XQJ
53+ * Added new API EntityKind SOME_CONTENT
54+ * Added new API StreamResource which is able to specify whether a
55+ stream is seekable or not.
56+ * Added new functions in the fetch module and the StaticContext to fetch
57 resources as binary
58
59 Optimizations:
60- * optimized insertion into a collection (don't copy it if the node was created by an element constructor
61- and is not used anywhere else in the query
62+ * optimized insertion into a collection (don't copy it if the node was
63+ created by an element constructor and is not used anywhere else in the query)
64+ * Fixed performance problem with the findNodeSources function of the no-copy rule
65
66 Bug Fixes/Other Changes:
67+ * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
68+ * Fixed bug #1001463 (type not available during computation of function caching)
69 * Fixed bugs #905028 (Allow to set base URI to undefined)
70- * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
71+ * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number()
72+ * fn:format-number raises FODF1310 instead of XTDE1310
73 * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
74- * Fixed memory leak in case of index truncation
75 * Fixed bug #862971 (no error upon duplicate function declarations)
76- * Fixed bug in mergeUpdates() method
77 * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
78- * Fixed bug #986075 (encountering flwor expr with no clauses; due to common subexression being formed when inlining var in if-then-else expression)
79+ * Fixed bug #986075 (encountering flwor expr with no clauses)
80 * Fixed bug #967864 (var substitution did not update theFreeVars property)
81 * Fixed bug #891650 (context size var not always declared within path expr)
82 * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
83@@ -52,7 +48,6 @@
84 * Fixed bug #866547 (protect index-join rule from general flwor)
85 * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
86 * Fixed bug #967428 (do not hoist index creation outside a try-catch)
87- * Fixed performance problem with the findNodeSources function of the no-copy rule
88 * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
89 * Fixed bug #966706 (key uniqueness of index not enforced during incremental refresh)
90 * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
91@@ -64,7 +59,7 @@
92 * Fixed bug #996084 (crash in Streamable*Item with file module)
93 * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item type in same module)
94 * Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
95- * Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
96+ * Fixed bug #949910 (has-children may be invoked on all nodes)
97 * Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
98 * Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
99 * Fixed bug #857842 (Assertion failed with simple content element with comments)
100
101=== modified file 'NOTICE.txt'
102--- NOTICE.txt 2012-05-03 12:31:51 +0000
103+++ NOTICE.txt 2012-05-22 01:13:22 +0000
104@@ -1,5 +1,5 @@
105 -----------
106-Zorba 2.2.0
107+Zorba 2.5.0
108 -----------
109
110 (Note: This file is generated automatically from NOTICE.xml.
111
112=== modified file 'modules/ExternalModules.conf'
113--- modules/ExternalModules.conf 2012-05-03 12:31:51 +0000
114+++ modules/ExternalModules.conf 2012-05-22 01:13:22 +0000
115@@ -26,21 +26,21 @@
116 # "tag" is the VCS tag to check out (optional - defaults to HEAD;
117 # currently only works for bzr, since svn tags are just different URLS)
118
119-data-cleaning bzr lp:zorba/data-cleaning-module 1.1
120-data-converters bzr lp:zorba/data-converters-module zorba-2.2
121-data-formatting bzr lp:zorba/data-formatting-module zorba-2.2-jvm
122-excel bzr lp:zorba/excel-module zorba-2.2
123-geo bzr lp:zorba/geo-module zorba-2.2
124-http-client bzr lp:zorba/http-client-module zorba-2.2
125-image bzr lp:zorba/image-module 1.0
126-languages bzr lp:zorba/languages-module zorba-2.2
127-oauth bzr lp:zorba/oauth-module 1.0
128-process bzr lp:zorba/process-module zorba-2.2
129-security bzr lp:zorba/security-module zorba-2.2
130-system bzr lp:zorba/system-module zorba-2.2
131-xqxq bzr lp:zorba/xqxq-module zorba-2.2
132-email bzr lp:zorba/email-module zorba-2.2
133-util-jvm bzr lp:zorba/util-jvm-module
134-schema-tools bzr lp:zorba/schema-tools-module
135-stack bzr lp:zorba/stack-module
136-queue bzr lp:zorba/queue-module
137+data-cleaning bzr lp:zorba/data-cleaning-module zorba-2.5
138+data-converters bzr lp:zorba/data-converters-module zorba-2.5
139+data-formatting bzr lp:zorba/data-formatting-module zorba-2.5
140+excel bzr lp:zorba/excel-module zorba-2.5
141+geo bzr lp:zorba/geo-module zorba-2.5
142+http-client bzr lp:zorba/http-client-module zorba-2.5
143+image bzr lp:zorba/image-module zorba-2.5
144+languages bzr lp:zorba/languages-module zorba-2.5
145+oauth bzr lp:zorba/oauth-module zorba-2.5
146+process bzr lp:zorba/process-module zorba-2.5
147+security bzr lp:zorba/security-module zorba-2.5
148+system bzr lp:zorba/system-module zorba-2.5
149+xqxq bzr lp:zorba/xqxq-module zorba-2.5
150+email bzr lp:zorba/email-module zorba-2.5
151+util-jvm bzr lp:zorba/util-jvm-module zorba-2.5
152+schema-tools bzr lp:zorba/schema-tools-module zorba-2.5
153+stack bzr lp:zorba/stack-module zorba-2.5
154+queue bzr lp:zorba/queue-module zorba-2.5

Subscribers

People subscribed via source and target branches