Commit Graph

32 Commits

Author SHA1 Message Date
Stefan Miklosovic 156cc6fedc Merge branch 'cassandra-3.0' into cassandra-3.11 2023-01-10 09:02:46 +01:00
Maxim Muzafarov 877d6e6e95 Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira
patch by Maxim Muzafarov; reviewed by David Capwell, Aleksey Yeschenko, Stefan Miklosovic for CASSANDRA-18126
2023-01-09 09:37:53 +01:00
Mick Semb Wever 95d0a936f9
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix JMX security vulnerabilities
2022-10-18 22:50:49 +02:00
Abe Ratnofsky b2660bcf78
Fix JMX security vulnerabilities
patch by Abe Ratnofsky; reviewed by Jon Meredith, Mick Semb Wever, Sam Tunnicliffe for CASSANDRA-17921
2022-10-18 22:47:49 +02:00
Brandon Williams 386fe19d7d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-10-21 07:38:48 -05:00
Brandon Williams 94611e9f2b Set fork mode to class in IntelliJ default test config
Patch by Jacek Lewandowski; reviewed by brandonwilliams and marcuse for
CASSANDRA-17053
2021-10-21 07:37:53 -05:00
Caleb Rackliffe 4950878639 update IDEA setup generation to mark test/conf as test resources
patch by Abe Ratnofsky; reviewed by Caleb Rackliffe and Brandon Williams for CASSANDRA-16745
2021-07-25 11:37:33 -05:00
jacek-lewandowski 8857d04489 Fix broken IntelliJ configuration Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618 2021-07-25 11:37:33 -05:00
Mick Semb Wever fd7732389a Update IDE, Eclipse and NetBeans, classpaths for tests
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-07-25 11:37:33 -05:00
jacek-lewandowski d3e174fa22 Fix broken IntelliJ configuration Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618 2021-07-25 11:35:45 -05:00
Mick Semb Wever 6bf9b8b694 Update IDE, Eclipse and NetBeans, classpaths for tests
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-07-25 11:35:45 -05:00
Mick Semb Wever 3259d6de37 Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:35:45 -05:00
Mick Semb Wever b857aa12bf
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-06-17 11:42:18 +02:00
Jacek Lewandowski d54eff3a4a
Remove full project building from the generate-idea-files ant target
- that target was unnecessarily building the whole project which made it problematic to update the project while merging/rebasing if conflicts in the code were failing the compilation
 - updated system properties for default run test task in Intellij to match those when running tests from Ant
 - fix test-memory target

 patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16697
2021-06-17 11:25:58 +02:00
Caleb Rackliffe 6ef3eaf771 update IDEA setup generation to mark test/conf as test resources
patch by Abe Ratnofsky; reviewed by Caleb Rackliffe and Brandon Williams for CASSANDRA-16745
2021-06-16 14:15:40 -05:00
Mick Semb Wever 6a8e211fba
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-21 19:10:59 +01:00
Mick Semb Wever 14aa561c32
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-21 19:08:52 +01:00
Mick Semb Wever d69f7696e4
Create Jenkins pipeline definition, and split out Jenkins test-all builds to individual builds for each of the test targets
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15496
2020-01-21 18:59:16 +01:00
Dinesh A. Joshi 4675b3fd33 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 14:10:40 -07:00
Blake Eggleston 01d6548e0d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-25 10:21:55 -07:00
Blake Eggleston c3ce32e239 Fix assorted gossip races and add related runtime checks
Patch by Blake Eggleston; Reviewed by Ariel Weisberg for CASSANDRA-15059
2019-04-25 10:20:46 -07:00
Benedict Elliott Smith 2d05bff0ba Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-21 17:44:36 +00:00
Benedict Elliott Smith 459945bcf4 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-21 17:43:26 +00:00
Joseph Lynch 8ad4a9a522 In JVM dtests need to clean up after instance shutdown
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
2019-01-21 10:13:48 +00:00
Alex Petrov 1d5e0301f3 Introduce in-jvm distributed tests
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2019-01-21 10:13:48 +00:00
Robert Stupp 7eb6b997f2 Ninja, remove gen-thrift-java ant task from IntelliJ launch configs 2016-08-20 21:55:56 +10:00
Robert Stupp 528204267b Ninja, include lib/sigar-bin in java.library.path for IntelliJ launch configs 2016-08-20 21:34:13 +10:00
Christopher Batey b73f581355 Add basic testing support for the Cassandra Stress tool
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-11638
2016-07-04 14:48:52 +01:00
Robert Stupp 2db8bd560a Ninja-add test/conf to IntelliJ IDE JUnit default config 2016-04-10 18:00:19 +02:00
Robert Stupp 6ac831f327 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 17:24:42 +01:00
Robert Stupp 49d9e51555 Reevaluate inspections in generate-idea-files target
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9844
2015-11-20 17:24:03 +01:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
2015-04-07 18:12:16 +02:00