Skip to content

Commit 91c2010

Browse files
metonymic-smokeymetonymic-smokey
committed
bq changes
Change-Id: Ia645f65c598d1da3ebe371adce99fa2065935a92 Reviewed-on: https://review.couchbase.org/c/manifest/+/226756 Tested-by: Build Bot <[email protected]> Reviewed-by: Aditi Ahuja <[email protected]> Tested-by: Aditi Ahuja <[email protected]>
1 parent 3ac3293 commit 91c2010

File tree

1 file changed

+53
-77
lines changed

1 file changed

+53
-77
lines changed

‎toy/toy-aditi.xml

+53-77
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,47 @@
99
<default remote="couchbase" revision="master" />
1010

1111
<!-- Core Couchbase Server projects -->
12-
<project name="backup" remote="couchbase-priv" path="backup" groups="backup,notdefault,enterprise" revision="trinity"/>
13-
<project name="cbbs" remote="couchbase-priv" groups="backup,notdefault,enterprise" revision="trinity"/>
14-
<project name="cbft" revision="trinity"/>
15-
<project name="cbftx" remote="couchbase-priv" groups="notdefault,enterprise" revision="trinity"/>
12+
<project name="backup" remote="couchbase-priv" path="backup" groups="backup,notdefault,enterprise"/>
13+
<project name="bhive" path="goproj/src/github.com/couchbase/bhive" remote="couchbase-priv" revision="main" groups="notdefault,enterprise"/>
14+
<project name="cbbs" remote="couchbase-priv" groups="backup,notdefault,enterprise"/>
15+
<project name="cbft"/>
16+
<project name="cbftx" remote="couchbase-priv" groups="notdefault,enterprise"/>
1617
<project name="hebrew" remote="couchbase-priv" groups="notdefault,enterprise"/>
17-
<project name="cbgt" revision="trinity"/>
18-
<project name="cbsummary" path="goproj/src/github.com/couchbase/cbsummary"/>
19-
<project name="couchbase-cli" groups="kv" revision="trinity"/>
20-
<project name="couchdb" revision="trinity" dest-branch="unstable"/>
21-
<project name="couchstore" revision="trinity" groups="kv"/>
22-
<project name="docloader" path="goproj/src/github.com/couchbase/docloader" revision="cf3254d7dfb042192c9a23bd2e64a281c32a29d8" />
18+
<project name="cbgt"/>
19+
<project name="cbsummary" path="goproj/src/github.com/couchbase/cbsummary" groups="bsl"/>
20+
<project name="couchbase-cli" groups="kv"/>
21+
<project name="couchdb" dest-branch="unstable"/>
22+
<project name="couchstore" groups="kv"/>
23+
<project name="docloader" path="goproj/src/github.com/couchbase/docloader" />
2324
<!-- forestdb uses "cb-master" branch in place of "master" for all production builds. -->
2425
<!-- Future release-specific git branches, if necessary, should be made from cb-master. -->
2526
<project name="forestdb" revision="cb-master" groups="backup"/>
2627
<project name="geocouch"/>
27-
<project name="goxdcr" revision="trinity" path="goproj/src/github.com/couchbase/goxdcr" groups="bsl"/>
28-
<project name="gometa" revision="trinity" path="goproj/src/github.com/couchbase/gometa"/>
29-
<project name="nitro" revision="trinity" path="goproj/src/github.com/couchbase/nitro" groups="bsl"/>
30-
<project name="indexing" revision="trinity" path="goproj/src/github.com/couchbase/indexing" groups="bsl"/>
31-
<project name="plasma" revision="trinity" path="goproj/src/github.com/couchbase/plasma" remote="couchbase-priv" groups="notdefault,enterprise"/>
32-
<project name="eventing" revision="trinity" path="goproj/src/github.com/couchbase/eventing" dest-branch="unstable" groups="notdefault,enterprise"/>
33-
<project name="eventing-ee" revision="trinity" path="goproj/src/github.com/couchbase/eventing-ee" remote="couchbase-priv" dest-branch="unstable" groups="notdefault,enterprise"/>
34-
<project name="kv_engine" revision="trinity" groups="kv,bsl"/>
35-
<project name="libcouchbase" revision="refs/tags/3.3.14"/>
36-
<project name="magma" groups="notdefault,enterprise,kv_ee" remote="couchbase-priv" revision="trinity"/>
37-
<project name="ns_server" revision="trinity" groups="bsl"/>
38-
<project name="chronicle" revision="8d1feeb0d8b15e2b6a4c1a417addfd159b422a71" path="ns_server/deps/chronicle"/>
39-
<project name="vbmap" revision="trinity"/>
40-
<project name="phosphor" groups="bsl,kv" revision="trinity"/>
41-
<project name="platform" revision="trinity" groups="bsl,kv"/>
28+
<project name="gocbcrypto" path="goproj/src/github.com/couchbase/gocbcrypto" remote="couchbase-priv" revision="main" groups="notdefault,enterprise"/>
29+
<project name="goxdcr" path="goproj/src/github.com/couchbase/goxdcr" groups="bsl"/>
30+
<project name="gometa" path="goproj/src/github.com/couchbase/gometa"/>
31+
<project name="nitro" path="goproj/src/github.com/couchbase/nitro" dest-branch="unstable" groups="bsl"/>
32+
<project name="indexing" path="goproj/src/github.com/couchbase/indexing" dest-branch="unstable" groups="bsl"/>
33+
<project name="plasma" path="goproj/src/github.com/couchbase/plasma" remote="couchbase-priv" dest-branch="unstable" groups="notdefault,enterprise"/>
34+
<project name="eventing" path="goproj/src/github.com/couchbase/eventing" dest-branch="unstable" groups="notdefault,enterprise"/>
35+
<project name="eventing-ee" path="goproj/src/github.com/couchbase/eventing-ee" remote="couchbase-priv" dest-branch="unstable" groups="notdefault,enterprise"/>
36+
<project name="kv_engine" groups="kv,bsl"/>
37+
<project name="libcouchbase" revision="refs/tags/3.3.15"/>
38+
<project name="magma" groups="notdefault,enterprise,kv_ee" remote="couchbase-priv" />
39+
<project name="fusion" revision="main" groups="notdefault,enterprise,kv_ee" remote="couchbase-priv" />
40+
<project name="ns_server" groups="bsl"/>
41+
<project name="vbmap"/>
42+
<project name="phosphor" groups="bsl,kv"/>
43+
<project name="platform" groups="bsl,kv"/>
4244
<project name="product-texts"/>
43-
<project name="query-ee" path="goproj/src/github.com/couchbase/query-ee" remote="couchbase-priv" groups="notdefault,enterprise" revision="trinity"/>
44-
<project name="query" path="goproj/src/github.com/couchbase/query" groups="bsl" revision="trinity"/>
45-
<project name="query-ui" groups="bsl" revision="trinity"/>
45+
<project name="query-ee" path="goproj/src/github.com/couchbase/query-ee" remote="couchbase-priv" groups="notdefault,enterprise"/>
46+
<project name="query" path="goproj/src/github.com/couchbase/query" groups="bsl"/>
47+
<project name="query-ui" groups="bsl"/>
4648
<project name="regulator" revision="main" path="goproj/src/github.com/couchbase/regulator" remote="couchbase-priv" groups="notdefault,enterprise"/>
47-
<project name="sigar" groups="kv" revision="2da0c123cfb45ae39e76e730bd960db8812e3f20"/>
48-
<project name="subjson" groups="bsl,kv" revision="trinity"/>
49-
<project name="testrunner" revision="trinity"/>
50-
<project name="tlm" groups="bsl,kv" revision="trinity">
49+
<project name="sigar" groups="kv"/>
50+
<project name="subjson" groups="bsl,kv"/>
51+
<project name="testrunner"/>
52+
<project name="tlm" groups="bsl,kv">
5153
<copyfile src="Build.sh" dest="Build.sh" />
5254
<copyfile src="GNUmakefile" dest="GNUmakefile" />
5355
<copyfile src="Makefile" dest="Makefile" />
@@ -57,66 +59,40 @@
5759
<copyfile src="third-party-CMakeLists.txt" dest="third_party/CMakeLists.txt" />
5860
</project>
5961
<project name="udf-api" path="goproj/src/github.com/couchbase/udf-api"/>
62+
<project name="xdcrDiffer" path="goproj/src/github.com/couchbase/xdcrDiffer" revision="main"/>
6063
<!-- Analytics additions -->
61-
<project name="cbas-core" path="analytics" revision="trinity" remote="couchbase-priv" groups="notdefault,enterprise,analytics"/>
62-
<project name="asterixdb" path="analytics/asterixdb" revision="trinity" groups="notdefault,enterprise,analytics"/>
63-
<project name="analytics-dcp-client" path="analytics/java-dcp-client" revision="trinity" groups="notdefault,enterprise,analytics"/>
64-
<project name="cbas" path="goproj/src/github.com/couchbase/cbas" revision="trinity" remote="couchbase-priv" groups="notdefault,enterprise,analytics"/>
65-
<project name="cbas-ui" revision="704db180d01de15f70cacc9fc11c5d8d8d4ff965" groups="notdefault,enterprise,analytics"/>
64+
<project name="cbas-core" revision="morpheus" path="analytics" remote="couchbase-priv" groups="notdefault,enterprise,analytics"/>
65+
<project name="asterixdb" revision="morpheus" path="analytics/asterixdb" groups="notdefault,enterprise,analytics"/>
66+
<project name="analytics-dcp-client" revision="morpheus" path="analytics/java-dcp-client" groups="notdefault,enterprise,analytics"/>
67+
<project name="cbas" revision="morpheus" path="goproj/src/github.com/couchbase/cbas" remote="couchbase-priv" groups="notdefault,enterprise,analytics"/>
68+
<project name="cbas-ui" revision="morpheus" groups="notdefault,enterprise,analytics"/>
6669

6770
<!-- Third-party projects -->
68-
<project name="bleve" remote="blevesearch" revision="fix" path="godeps/src/github.com/blevesearch/bleve"/>
71+
<project name="zapx" remote="blevesearch" revision="bq" path="godeps/src/github.com/blevesearch/zapx"/>
72+
<project name="go-faiss" remote="blevesearch" revision="bq" path="godeps/src/github.com/blevesearch/go-faiss"/>
6973

7074
<!-- Go support libraries - Couchbase-supported -->
7175
<!-- Some are in goproj to facilitate eventual move to Go modules -->
72-
<project name="n1fty" path="goproj/src/github.com/couchbase/n1fty" groups="bsl" revision="trinity"/>
73-
<project name="go_json" path="goproj/src/github.com/couchbase/go_json" revision="trinity"/>
74-
<project name="gomemcached" path="goproj/src/github.com/couchbase/gomemcached" groups="backup" revision="trinity"/>
75-
<project name="cbauth" path="goproj/src/github.com/couchbase/cbauth" groups="backup" revision="trinity"/>
76-
<project name="go-couchbase" path="goproj/src/github.com/couchbase/go-couchbase" groups="backup" revision="trinity"/>
77-
<project name="goutils" path="goproj/src/github.com/couchbase/goutils" groups="bsl" revision="trinity"/>
78-
<project name="godbc" path="goproj/src/github.com/couchbase/godbc" revision="trinity"/>
79-
80-
<project name="clog" path="godeps/src/github.com/couchbase/clog"/>
81-
<project name="gocb" revision="refs/tags/v2.2.5" path="godeps/src/github.com/couchbase/gocb/v2"/>
82-
<project name="gocbcore" revision="refs/tags/v9.1.6" path="godeps/src/github.com/couchbase/gocbcore/v9"/>
83-
<project name="gojsonsm" remote="couchbaselabs" path="godeps/src/github.com/couchbaselabs/gojsonsm"/>
84-
85-
<!-- Go support libraries - third-party -->
86-
<project name="uuid" remote="couchbasedeps" revision="dec09d789f3dba190787f8b4454c7d3c936fed9e" path="godeps/src/github.com/google/uuid"/>
87-
<project name="protobuf" remote="couchbasedeps" revision="refs/tags/v1.4.2" path="godeps/src/github.com/golang/protobuf"/>
88-
<project name="mux" remote="couchbasedeps" revision="043ee6597c29786140136a5747b6a886364f5282" path="godeps/src/github.com/gorilla/mux" />
89-
<project name="go-metrics" remote="couchbasedeps" revision="cf1acfcdf4751e0554ffa765d03e479ec491cad6" path="godeps/src/github.com/rcrowley/go-metrics" />
90-
<project name="golang-snappy" remote="couchbasedeps" revision="723cc1e459b8eea2dea4583200fd60757d40097a" path="godeps/src/github.com/golang/snappy"/>
91-
<project name="golang-tools" remote="couchbasedeps" revision="a28dfb48e06b2296b66678872c2cb638f0304f20" path="godeps/src/golang.org/x/tools"/>
92-
<project name="crypto" remote="couchbasedeps" revision="refs/tags/v0.15.0" path="godeps/src/golang.org/x/crypto"/>
93-
<project name="sys" remote="couchbasedeps" revision="d36c6a25d886e7c9975d5bf247ac24887ba6da37" path="godeps/src/golang.org/x/sys"/>
94-
<project name="pkcs8" remote="couchbasedeps" revision="refs/tags/v1.1" path="godeps/src/github.com/youmark/pkcs8"/>
95-
<project name="client_golang" remote="couchbasedeps" revision="refs/tags/v1.12.1" path="godeps/src/github.com/prometheus/client_golang"/>
96-
<project name="client_model" remote="couchbasedeps" revision="6dc836ede0b5b08c61893c3ffeb474498b18bb83" path="godeps/src/github.com/prometheus/client_model"/>
97-
<project name="common" remote="couchbasedeps" revision="refs/tags/v0.33.0" path="godeps/src/github.com/prometheus/common"/>
98-
<project name="procfs" remote="couchbasedeps" revision="76fc8b844e3a18c31bf689e4fe7efdd5a2f41298" path="godeps/src/github.com/prometheus/procfs"/>
99-
<project name="xxhash" remote="couchbasedeps" revision="refs/tags/v2.1.2" path="goproj/src/github.com/cespare/xxhash"/>
100-
<project name="perks" remote="couchbasedeps" revision="refs/tags/v1.0.1" path="godeps/src/github.com/beorn7/perks"/>
101-
<project name="protobuf-go" remote="couchbasedeps" revision="refs/tags/v1.28.0" path="godeps/src/google.golang.org/protobuf"/>
102-
<project name="golang_protobuf_extensions" remote="couchbasedeps" revision="c182affec369e30f25d3eb8cd8a478dee585ae7d" path="godeps/src/github.com/matttproud/golang_protobuf_extensions"/>
103-
<project name="flatbuffers" remote="couchbasedeps" revision="1a8968225130caeddd16e227678e6f8af1926303" path="godeps/src/github.com/google/flatbuffers"/>
104-
<project name="errors" remote="couchbasedeps" revision="30136e27e2ac8d167177e8a583aa4c3fea5be833" path="godeps/src/github.com/pkg/errors"/>
105-
<project name="participle" remote="couchbasedeps" revision="d638c6e1953ed899e05a34da3935146790c60e46" path="godeps/src/github.com/alecthomas/participle"/>
106-
<project name="golang-pkg-pcre" remote="couchbasedeps" revision="48bb82a8b8ceea98f4e97825b43870f6ba1970d6" path="godeps/src/github.com/glenn-brown/golang-pkg-pcre"/>
107-
<project name="jsonschema" remote="couchbasedeps" revision="137f44a49015e5060a447c331aa37de6e0f50267" path="godeps/src/github.com/santhosh-tekuri/jsonschema"/>
76+
<project name="n1fty" path="goproj/src/github.com/couchbase/n1fty" groups="bsl"/>
77+
<project name="go_json" path="goproj/src/github.com/couchbase/go_json"/>
78+
<project name="gomemcached" path="goproj/src/github.com/couchbase/gomemcached" groups="backup"/>
79+
<project name="cbauth" path="goproj/src/github.com/couchbase/cbauth" groups="backup"/>
80+
<project name="go-couchbase" path="goproj/src/github.com/couchbase/go-couchbase" groups="backup"/>
81+
<project name="goutils" path="goproj/src/github.com/couchbase/goutils" groups="bsl"/>
82+
<project name="godbc" path="goproj/src/github.com/couchbase/godbc"/>
10883

10984
<!-- C/C++ support libraries -->
11085
<project name="gsl-lite" remote="couchbasedeps" revision="refs/tags/v0.38.1" path="third_party/gsl-lite" groups="kv"/>
11186
<project name="HdrHistogram_c" remote="couchbasedeps" revision="9ead6b88adbf8d6131e5ae7a3a699c477a3b4195" path="third_party/HdrHistogram_c" groups="kv"/>
11287
<project name="simdutf" remote="couchbasedeps" revision="refs/tags/v3.2.14" path="third_party/simdutf" groups="kv"/>
11388

11489
<!-- Couchbase internal build infrastructure -->
115-
<project name="build" path="cbbuild" revision="trinity" groups="notdefault,build">
116-
<annotation name="VERSION" value="7.6.6" keep="true"/>
90+
<project name="build" path="cbbuild" groups="notdefault,build">
91+
<annotation name="VERSION" value="8.0.0" keep="true"/>
11792
<annotation name="BSL_PRODUCT" value="Couchbase Server" keep="true"/>
118-
<annotation name="BSL_VERSION" value="7.6" keep="true"/>
93+
<annotation name="BSL_VERSION" value="8.0" keep="true"/>
11994
<annotation name="BSL_CHANGE_DATE" value="March 1, 2029" keep="true"/>
95+
<annotation name="BSL_MAIN_OK" value="true" keep="true"/>
12096
</project>
12197
<project name="voltron" remote="couchbase-priv" groups="notdefault,packaging" />
12298
<project name="couchdbx-app" groups="notdefault,packaging" />

0 commit comments

Comments
 (0)