diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index f17ad23396..84311ade17 100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@ -175,7 +175,8 @@
-
+
+
@@ -188,7 +189,7 @@
-
+
diff --git a/.build/cassandra-build-deps-template.xml b/.build/cassandra-build-deps-template.xml
new file mode 100644
index 0000000000..727da9179a
--- /dev/null
+++ b/.build/cassandra-build-deps-template.xml
@@ -0,0 +1,127 @@
+
+
+
+ 4.0.0
+
+ cassandra-parent
+ org.apache.cassandra
+ @version@
+ @final.name@-parent.pom
+
+ org.apache.cassandra
+ cassandra-build-deps
+ @version@
+
+
+ junit
+ junit
+
+
+ commons-io
+ commons-io
+
+
+ org.mockito
+ mockito-core
+
+
+ org.ow2.asm
+ asm
+
+
+ org.ow2.asm
+ asm-tree
+
+
+ org.ow2.asm
+ asm-commons
+
+
+ org.ow2.asm
+ asm-util
+
+
+ com.google.jimfs
+ jimfs
+
+
+ com.puppycrawl.tools
+ checkstyle
+
+
+ org.quicktheories
+ quicktheories
+
+
+ org.reflections
+ reflections
+
+
+ com.google.code.java-allocation-instrumenter
+ java-allocation-instrumenter
+
+
+ org.apache.cassandra
+ dtest-api
+
+
+ org.openjdk.jmh
+ jmh-core
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+
+
+ net.ju-n.compile-command-annotations
+ compile-command-annotations
+
+
+ org.apache.ant
+ ant-junit
+
+
+ org.apache.cassandra
+ harry-core
+
+
+ org.junit
+ junit-bom
+ pom
+
+
+ org.awaitility
+ awaitility
+
+
+ org.hamcrest
+ hamcrest
+
+
+ org.jacoco
+ org.jacoco.agent
+
+
+ org.jacoco
+ org.jacoco.ant
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+
+
+
diff --git a/.build/cassandra-deps-template.xml b/.build/cassandra-deps-template.xml
new file mode 100644
index 0000000000..513fcbc5aa
--- /dev/null
+++ b/.build/cassandra-deps-template.xml
@@ -0,0 +1,344 @@
+
+
+
+ 4.0.0
+
+ cassandra-parent
+ org.apache.cassandra
+ @version@
+ @final.name@-parent.pom
+
+ org.apache.cassandra
+ cassandra-all
+ @version@
+ Apache Cassandra
+ The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.
+ https://cassandra.apache.org
+ 2009
+
+
+ The Apache Software License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+ scm:https://gitbox.apache.org/repos/asf/cassandra.git
+ scm:https://gitbox.apache.org/repos/asf/cassandra.git
+ https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree
+
+
+
+ org.xerial.snappy
+ snappy-java
+
+
+ org.lz4
+ lz4-java
+
+
+ com.ning
+ compress-lzf
+
+
+ com.google.guava
+ guava
+
+
+ commons-cli
+ commons-cli
+
+
+ commons-codec
+ commons-codec
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-math3
+
+
+ org.antlr
+ antlr
+
+
+ org.antlr
+ ST4
+
+
+ org.antlr
+ antlr-runtime
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ log4j-over-slf4j
+
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+ com.googlecode.json-simple
+ json-simple
+
+
+ com.boundary
+ high-scale-lib
+
+
+ org.yaml
+ snakeyaml
+
+
+ org.mindrot
+ jbcrypt
+
+
+ io.airlift
+ airline
+
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+ io.dropwizard.metrics
+ metrics-jvm
+
+
+ io.dropwizard.metrics
+ metrics-logback
+
+
+ com.addthis.metrics
+ reporter-config3
+
+
+ com.clearspring.analytics
+ stream
+
+
+ ch.qos.logback
+ logback-core
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.apache.hadoop
+ hadoop-core
+
+
+ org.apache.hadoop
+ hadoop-minicluster
+
+
+ com.datastax.cassandra
+ cassandra-driver-core
+ shaded
+
+
+ net.java.dev.jna
+ jna
+
+
+ com.github.jbellis
+ jamm
+
+
+ io.netty
+ netty-bom
+ pom
+
+
+ io.netty
+ netty-all
+
+
+ net.openhft
+ chronicle-queue
+
+
+ net.openhft
+ chronicle-core
+
+
+ net.openhft
+ chronicle-bytes
+
+
+ net.openhft
+ chronicle-wire
+
+
+ net.openhft
+ chronicle-threads
+
+
+ org.fusesource
+ sigar
+
+
+ org.eclipse.jdt.core.compiler
+ ecj
+
+
+ org.caffinitas.ohc
+ ohc-core
+
+
+ org.caffinitas.ohc
+ ohc-core-j8
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+
+
+ org.jctools
+ jctools-core
+
+
+ org.ow2.asm
+ asm
+
+
+ com.carrotsearch
+ hppc
+
+
+ org.gridkit.jvmtool
+ sjk-cli
+ 0.14
+
+
+ org.gridkit.jvmtool
+ sjk-core
+
+
+ org.gridkit.jvmtool
+ sjk-stacktrace
+
+
+ org.gridkit.jvmtool
+ mxdump
+
+
+ org.gridkit.lab
+ jvm-attach-api
+
+
+ com.beust
+ jcommander
+
+
+ org.gridkit.jvmtool
+ sjk-json
+
+
+ com.github.luben
+ zstd-jni
+
+
+ org.psjava
+ psjava
+
+
+ io.netty
+ netty-tcnative-boringssl-static
+
+
+ javax.inject
+ javax.inject
+
+
+ com.google.j2objc
+ j2objc-annotations
+
+
+ org.hdrhistogram
+ HdrHistogram
+
+
+ de.jflex
+ jflex
+
+
+ com.github.rholder
+ snowball-stemmer
+
+
+ com.googlecode.concurrent-trees
+ concurrent-trees
+
+
+ com.google.code.findbugs
+ jsr305
+
+
+ net.ju-n.compile-command-annotations
+ compile-command-annotations
+
+
+ org.assertj
+ assertj-core
+
+
+ org.jboss.byteman
+ byteman-install
+
+
+ org.jboss.byteman
+ byteman
+
+
+ org.jboss.byteman
+ byteman-submit
+
+
+ org.jboss.byteman
+ byteman-bmunit
+
+
+ com.github.seancfoley
+ ipaddress
+
+
+
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
new file mode 100644
index 0000000000..73a6431408
--- /dev/null
+++ b/.build/parent-pom-template.xml
@@ -0,0 +1,1029 @@
+
+
+
+ 4.0.0
+
+ apache
+ org.apache
+ 22
+
+ org.apache.cassandra
+ cassandra-parent
+ @version@
+ pom
+ Apache Cassandra
+ The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.
+ https://cassandra.apache.org
+ 2009
+
+
+ The Apache Software License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+ 1.12.13
+ 4.0.6
+ 0.5.1
+
+
+ @asm.version@
+ @jamm.version@
+ @allocation-instrumenter.version@
+ @ecj.version@
+ @jacoco.version@
+ @jflex.version@
+
+
+
+ adelapena
+ Andres de la Peña
+
+
+ alakshman
+ Avinash Lakshman
+
+
+ aleksey
+ Aleksey Yeschenko
+
+
+ amorton
+ Aaron Morton
+
+
+ aweisberg
+ Ariel Weisberg
+
+
+ bdeggleston
+ Blake Eggleston
+
+
+ benedict
+ Benedict Elliott Smith
+
+
+ benjamin
+ Benjamin Lerer
+
+
+ blambov
+ Branimir Lambov
+
+
+ brandonwilliams
+ Brandon Williams
+
+
+ carl
+ Carl Yeksigian
+
+
+ dbrosius
+ David Brosiusd
+
+
+ dikang
+ Dikang Gu
+
+
+ eevans
+ Eric Evans
+
+
+ edimitrova
+ Ekaterina Dimitrova
+
+
+ gdusbabek
+ Gary Dusbabek
+
+
+ goffinet
+ Chris Goffinet
+
+
+ ifesdjeen
+ Alex Petrov
+
+
+ jaakko
+ Laine Jaakko Olavi
+
+
+ jake
+ T Jake Luciani
+
+
+ jasonbrown
+ Jason Brown
+
+
+ jbellis
+ Jonathan Ellis
+
+
+ jfarrell
+ Jake Farrell
+
+
+ jjirsa
+ Jeff Jirsa
+
+
+ jkni
+ Joel Knighton
+
+
+ jmckenzie
+ Josh McKenzie
+
+
+ johan
+ Johan Oskarsson
+
+
+ junrao
+ Jun Rao
+
+
+ jzhuang
+ Jay Zhuang
+
+
+ kohlisankalp
+ Sankalp Kohli
+
+
+ marcuse
+ Marcus Eriksson
+
+
+ mck
+ Michael Semb Wever
+
+
+ mishail
+ Mikhail Stepura
+
+
+ mshuler
+ Michael Shuler
+
+
+ paulo
+ Paulo Motta
+
+
+ pmalik
+ Prashant Malik
+
+
+ rstupp
+ Robert Stupp
+
+
+ scode
+ Peter Schuller
+
+
+ beobal
+ Sam Tunnicliffe
+
+
+ slebresne
+ Sylvain Lebresne
+
+
+ stefania
+ Stefania Alborghetti
+
+
+ tylerhobbs
+ Tyler Hobbs
+
+
+ vijay
+ Vijay Parthasarathy
+
+
+ xedin
+ Pavel Yaskevich
+
+
+ yukim
+ Yuki Morishita
+
+
+ zznate
+ Nate McCall
+
+
+
+ scm:https://gitbox.apache.org/repos/asf/cassandra.git
+ scm:https://gitbox.apache.org/repos/asf/cassandra.git
+ https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree
+
+
+
+
+
+ org.xerial.snappy
+ snappy-java
+ 1.1.8.4
+
+
+ org.lz4
+ lz4-java
+ 1.8.0
+
+
+ com.ning
+ compress-lzf
+ 0.8.4
+ provided
+
+
+ com.github.luben
+ zstd-jni
+ 1.5.0-4
+
+
+ com.google.guava
+ guava
+ 27.0-jre
+
+
+ jsr305
+ com.google.code.findbugs
+
+
+ animal-sniffer-annotations
+ org.codehaus.mojo
+
+
+ listenablefuture
+ com.google.guava
+
+
+ failureaccess
+ com.google.guava
+
+
+ checker-qual
+ org.checkerframework
+
+
+ error_prone_annotations
+ com.google.errorprone
+
+
+
+
+ com.google.jimfs
+ jimfs
+ 1.1
+
+
+ org.hdrhistogram
+ HdrHistogram
+ 2.1.9
+
+
+ commons-cli
+ commons-cli
+ 1.1
+
+
+ commons-codec
+ commons-codec
+ 1.9
+
+
+ commons-io
+ commons-io
+ 2.6
+
+
+ org.apache.commons
+ commons-lang3
+ 3.11
+
+
+ org.apache.commons
+ commons-math3
+ 3.2
+
+
+ org.antlr
+ antlr
+ 3.5.2
+ provided
+
+
+ stringtemplate
+ org.antlr
+
+
+
+
+ org.antlr
+ ST4
+ 4.0.8
+
+
+ org.antlr
+ antlr-runtime
+ 3.5.2
+
+
+ stringtemplate
+ org.antlr
+
+
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.25
+
+
+ org.slf4j
+ log4j-over-slf4j
+ 1.7.25
+
+
+ org.slf4j
+ jcl-over-slf4j
+ 1.7.25
+
+
+ ch.qos.logback
+ logback-core
+ 1.2.9
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.9
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.13.2
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.13.2.2
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.13.2
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ 2.13.2
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+ 2.13.2
+ test
+
+
+ snakeyaml
+ org.yaml
+
+
+
+
+ com.googlecode.json-simple
+ json-simple
+ 1.1
+
+
+ com.boundary
+ high-scale-lib
+ 1.0.6
+
+
+ com.github.jbellis
+ jamm
+ ${jamm.version}
+
+
+ org.yaml
+ snakeyaml
+ 1.26
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+ hamcrest-core
+ org.hamcrest
+
+
+
+
+ org.mockito
+ mockito-core
+ 3.2.4
+ test
+
+
+ org.quicktheories
+ quicktheories
+ 0.26
+ test
+
+
+ com.google.code.java-allocation-instrumenter
+ java-allocation-instrumenter
+ ${allocation-instrumenter.version}
+ test
+
+
+ guava
+ com.google.guava
+
+
+
+
+ org.apache.cassandra
+ harry-core
+ 0.0.1
+ test
+
+
+ org.reflections
+ reflections
+ 0.10.2
+ test
+
+
+ org.apache.cassandra
+ dtest-api
+ 0.0.13
+ test
+
+
+ com.puppycrawl.tools
+ checkstyle
+ 8.40
+ test
+
+
+ org.apache.hadoop
+ hadoop-core
+ 1.0.3
+ provided
+
+
+ servlet-api
+ org.mortbay.jetty
+
+
+ commons-logging
+ commons-logging
+
+
+ commons-lang
+ commons-lang
+
+
+ core
+ org.eclipse.jdt
+
+
+ ant
+ ant
+
+
+ junit
+ junit
+
+
+ jackson-mapper-asl
+ org.codehaus.jackson
+
+
+ slf4j-api
+ org.slf4j
+
+
+
+
+ org.apache.hadoop
+ hadoop-minicluster
+ 1.0.3
+ provided
+
+
+ asm
+ asm
+
+
+ jackson-mapper-asl
+ org.codehaus.jackson
+
+
+ slf4j-api
+ org.slf4j
+
+
+
+
+ net.java.dev.jna
+ jna
+ 5.9.0
+
+
+ org.jacoco
+ org.jacoco.agent
+ ${jacoco.version}
+ test
+
+
+ org.jacoco
+ org.jacoco.ant
+ ${jacoco.version}
+ test
+
+
+ asm
+ org.ow2.asm
+
+
+
+
+ org.jboss.byteman
+ byteman-install
+ ${byteman.version}
+ provided
+
+
+ org.jboss.byteman
+ byteman
+ ${byteman.version}
+ provided
+
+
+ org.jboss.byteman
+ byteman-submit
+ ${byteman.version}
+ provided
+
+
+ org.jboss.byteman
+ byteman-bmunit
+ ${byteman.version}
+ provided
+
+
+ net.bytebuddy
+ byte-buddy
+ ${bytebuddy.version}
+
+
+ net.bytebuddy
+ byte-buddy-agent
+ ${bytebuddy.version}
+
+
+ org.openjdk.jmh
+ jmh-core
+ 1.21
+ test
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ 1.21
+ test
+
+
+ org.apache.ant
+ ant-junit
+ 1.10.12
+ test
+
+
+ org.apache.cassandra
+ cassandra-all
+ 4.1-alpha2-SNAPSHOT
+
+
+ io.dropwizard.metrics
+ metrics-core
+ 3.1.5
+
+
+ io.dropwizard.metrics
+ metrics-jvm
+ 3.1.5
+
+
+ io.dropwizard.metrics
+ metrics-logback
+ 3.1.5
+
+
+ com.addthis.metrics
+ reporter-config3
+ 3.0.3
+
+
+ hibernate-validator
+ org.hibernate
+
+
+
+
+ org.mindrot
+ jbcrypt
+ 0.4
+
+
+ io.airlift
+ airline
+ 0.8
+
+
+ jsr305
+ com.google.code.findbugs
+
+
+
+
+ io.netty
+ netty-bom
+ 4.1.58.Final
+ pom
+ provided
+
+
+ io.netty
+ netty-all
+ 4.1.58.Final
+
+
+ io.netty
+ netty-tcnative-boringssl-static
+ 2.0.36.Final
+
+
+ net.openhft
+ chronicle-queue
+ 5.20.123
+
+
+ tools
+ com.sun
+
+
+
+
+ net.openhft
+ chronicle-core
+ 2.20.126
+
+
+ chronicle-analytics
+ net.openhft
+
+
+ annotations
+ org.jetbrains
+
+
+
+
+ net.openhft
+ chronicle-bytes
+ 2.20.111
+
+
+ annotations
+ org.jetbrains
+
+
+
+
+ net.openhft
+ chronicle-wire
+ 2.20.117
+
+
+ compiler
+ net.openhft
+
+
+
+
+ net.openhft
+ chronicle-threads
+ 2.20.111
+
+
+ affinity
+ net.openhft
+
+
+ jna
+ net.java.dev.jna
+
+
+ jna-platform
+ net.java.dev.jna
+
+
+
+
+ com.google.code.findbugs
+ jsr305
+ 2.0.2
+
+
+ com.clearspring.analytics
+ stream
+ 2.5.2
+
+
+ fastutil
+ it.unimi.dsi
+
+
+
+
+ com.datastax.cassandra
+ cassandra-driver-core
+ 3.11.0
+ shaded
+
+
+ netty-buffer
+ io.netty
+
+
+ netty-codec
+ io.netty
+
+
+ netty-handler
+ io.netty
+
+
+ netty-transport
+ io.netty
+
+
+ slf4j-api
+ org.slf4j
+
+
+ jnr-ffi
+ com.github.jnr
+
+
+ jnr-posix
+ com.github.jnr
+
+
+
+
+ org.eclipse.jdt.core.compiler
+ ecj
+ ${ecj.version}
+
+
+ org.caffinitas.ohc
+ ohc-core
+ ${ohc.version}
+
+
+ slf4j-api
+ org.slf4j
+
+
+
+
+ org.caffinitas.ohc
+ ohc-core-j8
+ ${ohc.version}
+
+
+ net.ju-n.compile-command-annotations
+ compile-command-annotations
+ 1.2.0
+ provided
+
+
+ org.fusesource
+ sigar
+ 1.6.4
+
+
+ log4j
+ log4j
+
+
+
+
+ com.carrotsearch
+ hppc
+ 0.8.1
+
+
+ de.jflex
+ jflex
+ ${jflex.version}
+
+
+ ant
+ org.apache.ant
+
+
+
+
+ com.github.rholder
+ snowball-stemmer
+ 1.3.0.581.1
+
+
+ com.googlecode.concurrent-trees
+ concurrent-trees
+ 2.4.0
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ 2.9.2
+
+
+ org.jctools
+ jctools-core
+ 3.1.0
+
+
+ org.ow2.asm
+ asm
+ ${asm.version}
+
+
+ org.ow2.asm
+ asm-tree
+ ${asm.version}
+ test
+
+
+ org.ow2.asm
+ asm-commons
+ ${asm.version}
+ test
+
+
+ org.ow2.asm
+ asm-util
+ ${asm.version}
+ test
+
+
+ org.gridkit.jvmtool
+ sjk-cli
+ 0.14
+
+
+ org.gridkit.jvmtool
+ sjk-core
+ 0.14
+
+
+ sjk-hflame
+ org.gridkit.jvmtool
+
+
+ sjk-hflame
+ org.perfkit.sjk.parsers
+
+
+ sjk-jfr-standalone
+ org.perfkit.sjk.parsers
+
+
+ sjk-nps
+ org.perfkit.sjk.parsers
+
+
+ sjk-jfr5
+ org.perfkit.sjk.parsers
+
+
+ sjk-jfr6
+ org.perfkit.sjk.parsers
+
+
+
+
+ org.gridkit.jvmtool
+ sjk-stacktrace
+ 0.14
+
+
+ org.gridkit.jvmtool
+ mxdump
+ 0.14
+
+
+ org.gridkit.lab
+ jvm-attach-api
+ 1.5
+
+
+ org.gridkit.jvmtool
+ sjk-json
+ 0.14
+
+
+ com.beust
+ jcommander
+ 1.30
+
+
+ org.psjava
+ psjava
+ 0.1.19
+
+
+ javax.inject
+ javax.inject
+ 1
+
+
+ com.google.j2objc
+ j2objc-annotations
+ 1.3
+
+
+ org.junit
+ junit-bom
+ 5.6.0
+ pom
+ test
+
+
+ org.assertj
+ assertj-core
+ 3.15.0
+ provided
+
+
+ org.awaitility
+ awaitility
+ 4.0.3
+ test
+
+
+ hamcrest
+ org.hamcrest
+
+
+
+
+ org.hamcrest
+ hamcrest
+ 2.2
+ test
+
+
+ com.github.seancfoley
+ ipaddress
+ 5.3.3
+
+
+
+
diff --git a/CHANGES.txt b/CHANGES.txt
index 76f2602391..72b4e478fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.2
+ * Remove dependency on Maven Ant Tasks (CASSANDRA-17750)
* Update ASM(9.1 to 9.3), Mockito(1.10.10 to 1.12.13) and ByteBuddy(3.2.4 to 4.7.0) (CASSANDRA-17835)
* Add the ability for operators to loosen the definition of "empty" for edge cases (CASSANDRA-17842)
* Fix potential out of range exception on column index downsampling (CASSANDRA-17839)
diff --git a/build.xml b/build.xml
index ba9b81d4bc..525486d816 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
@@ -94,11 +93,6 @@
-
-
-
-
@@ -124,37 +118,17 @@
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -278,7 +252,6 @@
-
@@ -457,426 +430,6 @@
-
-
-
-
-
-
-
- Downloading Maven ANT Tasks...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1094,15 +647,28 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2277,7 +1843,7 @@
-
+
@@ -2287,7 +1853,7 @@
classpathref="checkstyle.lib.path"/>
-
+
@@ -2303,7 +1869,7 @@
-
+
@@ -2321,7 +1887,7 @@