This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1a92e4a6490c0b38ef681c5a3a24309f1fea91ac
Merge: 9b32b8a 9e51339
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Mar 27 00:36:28 2021 +0100
Merge branch 'cassandra-3.11' into trunk
doc/source/_util/cql.py | 17 +++++++++++++++++
ide/nbproject/update-netbeans-classpaths.sh | 17 +++++++++++++++++
pylib/cassandra-cqlsh-tests.sh | 17 +++++++++++++++++
.../cassandra/stress/report/TimingIntervals.java | 20 ++++++++++++++++++--
4 files changed, 69 insertions(+), 2 deletions(-)
diff --cc ide/nbproject/update-netbeans-classpaths.sh
index afef864,0000000..929798a
mode 100755,000000..100755
--- a/ide/nbproject/update-netbeans-classpaths.sh
+++ b/ide/nbproject/update-netbeans-classpaths.sh
@@@ -1,14 -1,0 +1,31 @@@
+#!/bin/bash
+#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++#
+# Update the classpaths elements in the project.xml found in the same
directory
+# Works around the lack of wildcarded classpaths in netbeans freeform
projects
+# ref: https://netbeans.org/bugzilla/show_bug.cgi?id=116185
+#
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+cd $DIR/../..
+CLASSPATH=`for f in lib/*.jar ; do echo -n '${project.dir}/'$f: ; done ; for
f in build/lib/jars/*.jar ; do echo -n '${project.dir}/'$f: ; done ;`
+
+sed -i ''
's/cassandra\.classpath\.jars\">.*<\/property>/cassandra\.classpath\.jars\">NEW_CLASSPATH<\/property>/'
$DIR/project.xml
+sed -i '' "s@NEW_CLASSPATH@"$CLASSPATH"@" $DIR/project.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
