[ https://issues.apache.org/jira/browse/CASSANDRA-16704?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17361837#comment-17361837 ]
Michael Semb Wever edited comment on CASSANDRA-16704 at 6/11/21, 3:13 PM: -------------------------------------------------------------------------- Testing both patches on this [branch|https://github.com/apache/cassandra/compare/trunk...thelastpickle:mck/4.0/16704]. Between builds on cassandra-4.0.0 and these patches, the {{lib/}} and {{build/lib/jars/}} result in identical contents. But the {{build/test/lib/jars/}} directory contains differences: {code:java} ❯ diff <(ls build/test/lib/jars/) <(ls ../cassandra/build/test/lib/jars/) 11d10 < assertj-core-3.15.0.jar 15,18d13 < byteman-4.0.6.jar < byteman-bmunit-4.0.6.jar < byteman-install-4.0.6.jar < byteman-submit-4.0.6.jar 22d16 < compile-command-annotations-1.2.0.jar {code} ;that is those jar files no longer appear under {{build/test/lib/jars/}} which is the intentional of the patch (as they are already "provided" and so under {{build/lib/jars/}}). CI: [!https://ci-cassandra.apache.org/view/patches/job/Cassandra-devbranch/862/badge/icon!|https://ci-cassandra.apache.org/blue/organizations/jenkins/Cassandra-devbranch/detail/Cassandra-devbranch/862/pipeline] was (Author: michaelsembwever): Testing both patches. Between builds on cassandra-4.0.0 and these patches, the {{lib/}} and {{build/lib/jars/}} result in identical contents. But the {{build/test/lib/jars/}} directory contains differences: {code:java} ❯ diff <(ls build/test/lib/jars/) <(ls ../cassandra/build/test/lib/jars/) 11d10 < assertj-core-3.15.0.jar 15,18d13 < byteman-4.0.6.jar < byteman-bmunit-4.0.6.jar < byteman-install-4.0.6.jar < byteman-submit-4.0.6.jar 22d16 < compile-command-annotations-1.2.0.jar {code} ;that is those jar files no longer appear under {{build/test/lib/jars/}} which is the intentional of the patch (as they are already "provided" and so under {{build/lib/jars/}}). CI: [!https://ci-cassandra.apache.org/view/patches/job/Cassandra-devbranch/862/badge/icon!|https://ci-cassandra.apache.org/blue/organizations/jenkins/Cassandra-devbranch/detail/Cassandra-devbranch/862/pipeline] > Fix imports; run tests with packaged dependencies > ------------------------------------------------- > > Key: CASSANDRA-16704 > URL: https://issues.apache.org/jira/browse/CASSANDRA-16704 > Project: Cassandra > Issue Type: Bug > Components: Build, Test/burn, Test/unit > Reporter: Angelo Polo > Assignee: Angelo Polo > Priority: Normal > Fix For: 4.0.x, 4.x > > Attachments: cleanup-imports.patch, dedup-deps.patch > > > Tests are currently run with a classpath containing _all_ downloaded jars. > The tests would be more reflective of the behavior of a runtime environment > if the test classpath only contained jars that are bundled with the binary > release, together with explicit test dependencies. Ideally we'd use the > build/lib/ jars for the classpath since that's what gets packaged, but since > these aren't available at test compile time and should be identical to lib/ > anyway, I've used the later. > Doing so exposed a couple of references in src/java to > "org.apache.commons.lang", which is not available at runtime (should be > "org.apache.commons.lang*3*"). > Attached patch modifies the test classpath, fixes various imports in both > test/ and src/ classes, and makes some simple substitutions in the tests such > as using AbstractMap.SimpleEntry in place of > org.apache.commons.collections.keyvalue.AbstractMapEntry. -- This message was sent by Atlassian Jira (v8.3.4#803005) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org