This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fd7732389aa77a94d3d5879165e8acde48125d5b 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 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 9b379e8..585a325 100644 --- a/build.xml +++ b/build.xml @@ -1736,17 +1736,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 72b16f2..1ab29a6 100644 --- a/ide/idea-iml-file.xml +++ b/ide/idea-iml-file.xml @@ -64,6 +64,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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
