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
The following commit(s) were added to refs/heads/trunk by this push:
new c65500e Update IDE, Eclipse and NetBeans, classpaths for tests
c65500e is described below
commit c65500e8a1213f194531bbfc77f37f0d7bf270df
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Apr 5 11:28:13 2021 +0200
Update IDE, Eclipse and NetBeans, classpaths for tests
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova,
Benjamin Lerer for CASSANDRA-16560
---
build.xml | 14 +++++++++++---
ide/idea-iml-file.xml | 1 +
ide/nbproject/project.xml | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 93fb254..6e5d4c1 100644
--- a/build.xml
+++ b/build.xml
@@ -2159,17 +2159,25 @@
<fileset dir="build/lib/jars">
<include name="**/*.jar" />
</fileset>
+ <fileset dir="build/test/lib/jars">
+ <include name="**/*.jar" />
+ </fileset>
</path>
<property name="eclipse-project-libs"
refid="eclipse-project-libs-path"/>
- <script language="javascript" classpathref="cassandra.classpath">
<![CDATA[
- var File = java.io.File;
+ <script language="javascript">
+ <classpath>
+ <path refid="cassandra.classpath"/>
+ <path refid="cassandra.classpath.test"/>
+ </classpath>
+ <![CDATA[
+ var File = java.io.File;
var FilenameUtils =
Packages.org.apache.commons.io.FilenameUtils;
jars =
project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
cp = "";
for (i=0; i< jars.length; i++) {
srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
- srcdir =
FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources');
+ srcdir =
FilenameUtils.concat(project.getProperty("build.test.dir"), 'sources');
srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
cp += ' <classpathentry kind="lib" path="' + jars[i] + '"';
diff --git a/ide/idea-iml-file.xml b/ide/idea-iml-file.xml
index 86827c3..865d041 100644
--- a/ide/idea-iml-file.xml
+++ b/ide/idea-iml-file.xml
@@ -66,6 +66,7 @@
<root url="file://$MODULE_DIR$/build/lib/sources" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/build/lib/jars"
recursive="false" />
+ <jarDirectory url="file://$MODULE_DIR$/build/test/lib/jars"
recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/build/lib/sources"
recursive="false" type="SOURCES" />
</library>
</orderEntry>
diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
index bcac903..434c8fc 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -7,7 +7,7 @@
<properties>
<property name="project.dir">..</property>
<!-- the compile classpaths should be distinct per compilation
unit… but it is kept simple and the build will catch errors -->
- <property
name="cassandra.classpath.jars">${project.dir}/lib/HdrHistogram-2.1.9.jar:${project.dir}/lib/ST4-4.0.8.jar:${project.dir}/lib/airline-0.8.jar:${project.dir}/lib/antlr-runtime-3.5.2.jar:${project.dir}/lib/asm-7.1.jar:${project.dir}/lib/caffeine-2.3.5.jar:${project.dir}/lib/cassandra-driver-core-3.11.0-shaded.jar:${project.dir}/lib/chronicle-bytes-2.20.111.jar:${project.dir}/lib/chronicle-core-2.20.126.jar:${project.dir}/lib/chronicle-queue-5.20.123.jar:${project.
[...]
+ <property
name="cassandra.classpath.jars">${project.dir}/build/lib/jars/HdrHistogram-2.1.9.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/airline-0.8.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/asm-7.1.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/byteman-4.0.6.jar:${project.dir}/build/lib/jars/byteman-bmunit-4.
[...]
</properties>
<folders>
<source-folder>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
