This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0910901d7b94ec56d864c4e99b84cd9555063711 Merge: f038059e89 17afd5e6be Author: Jacek Lewandowski <[email protected]> AuthorDate: Thu Jul 13 15:33:12 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Moved jflex from runtime to build dependencies .build/cassandra-build-deps-template.xml | 4 ++++ .build/cassandra-deps-template.xml | 4 ---- CHANGES.txt | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --cc .build/cassandra-build-deps-template.xml index b5db6846da,0000000000..6c6eb78fd2 mode 100644,000000..100644 --- a/.build/cassandra-build-deps-template.xml +++ b/.build/cassandra-build-deps-template.xml @@@ -1,131 -1,0 +1,135 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>cassandra-parent</artifactId> + <groupId>org.apache.cassandra</groupId> + <version>@version@</version> + <relativePath>@[email protected]</relativePath> + </parent> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-build-deps</artifactId> + <version>@version@</version> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-inline</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + </dependency> + <dependency> + <groupId>com.google.jimfs</groupId> + <artifactId>jimfs</artifactId> + </dependency> + <dependency> + <groupId>org.quicktheories</groupId> + <artifactId>quicktheories</artifactId> + </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.java-allocation-instrumenter</groupId> + <artifactId>java-allocation-instrumenter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>dtest-api</artifactId> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-core</artifactId> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-generator-annprocess</artifactId> + </dependency> + <dependency> + <groupId>net.ju-n.compile-command-annotations</groupId> + <artifactId>compile-command-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>harry-core</artifactId> + </dependency> + <dependency> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + </dependency> + <dependency> + <groupId>org.jacoco</groupId> + <artifactId>org.jacoco.agent</artifactId> + </dependency> + <dependency> + <groupId>org.jacoco</groupId> + <artifactId>org.jacoco.ant</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + </dependency> + <dependency> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-jre8</artifactId> + </dependency> ++ <dependency> ++ <groupId>de.jflex</groupId> ++ <artifactId>jflex</artifactId> ++ </dependency> + </dependencies> +</project> diff --cc .build/cassandra-deps-template.xml index e907bffa82,0000000000..4041a54195 mode 100644,000000..100644 --- a/.build/cassandra-deps-template.xml +++ b/.build/cassandra-deps-template.xml @@@ -1,380 -1,0 +1,376 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>cassandra-parent</artifactId> + <groupId>org.apache.cassandra</groupId> + <version>@version@</version> + <relativePath>@[email protected]</relativePath> + </parent> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-all</artifactId> + <version>@version@</version> + <name>Apache Cassandra</name> + <description>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.</description> + <url>https://cassandra.apache.org</url> + <inceptionYear>2009</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <scm> + <connection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</connection> + <developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree</url> + </scm> + <dependencies> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> + <dependency> + <groupId>com.ning</groupId> + <artifactId>compress-lzf</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>ST4</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + </dependency> + <dependency> + <groupId>com.boundary</groupId> + <artifactId>high-scale-lib</artifactId> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + </dependency> + <dependency> + <groupId>org.mindrot</groupId> + <artifactId>jbcrypt</artifactId> + </dependency> + <dependency> + <groupId>io.airlift</groupId> + <artifactId>airline</artifactId> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-logback</artifactId> + </dependency> + <dependency> + <groupId>com.addthis.metrics</groupId> + <artifactId>reporter-config3</artifactId> + </dependency> + <dependency> + <groupId>com.clearspring.analytics</groupId> + <artifactId>stream</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> + <dependency> + <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-core</artifactId> + <classifier>shaded</classifier> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </dependency> + <dependency> + <groupId>com.github.jbellis</groupId> + <artifactId>jamm</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <type>pom</type> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </dependency> + + <!-- chronicle queue, and fixed transitive dependencies --> + <dependency> + <groupId>net.openhft</groupId> + <artifactId>chronicle-queue</artifactId> + </dependency> + <dependency> + <groupId>net.openhft</groupId> + <artifactId>chronicle-core</artifactId> + </dependency> + <dependency> + <groupId>net.openhft</groupId> + <artifactId>chronicle-bytes</artifactId> + </dependency> + <dependency> + <groupId>net.openhft</groupId> + <artifactId>chronicle-wire</artifactId> + </dependency> + <dependency> + <groupId>net.openhft</groupId> + <artifactId>chronicle-threads</artifactId> + </dependency> + <dependency> + <!-- transitive to chronicle-core --> + <groupId>net.openhft</groupId> + <artifactId>posix</artifactId> + </dependency> + <dependency> + <!-- transitive to posix to chronicle-core --> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + </dependency> + <dependency> + <!-- transitive to posix to chronicle-core --> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-ffi</artifactId> + </dependency> + <dependency> + <!-- transitive to jnr-ffi to posix to chronicle-core --> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + </dependency> + <dependency> + <!-- transitive to jnr-ffi to posix to chronicle-core --> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + <classifier>native</classifier> + </dependency> + <dependency> + <!-- transitive to jnr-ffi to chronicle-core --> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-constants</artifactId> + </dependency> + <dependency> + <!-- transitive to chronicle-threads --> + <groupId>net.openhft</groupId> + <artifactId>affinity</artifactId> + </dependency> + <!-- end of chronicle-queue --> + + <dependency> + <groupId>org.fusesource</groupId> + <artifactId>sigar</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jdt.core.compiler</groupId> + <artifactId>ecj</artifactId> + </dependency> + <dependency> + <groupId>org.caffinitas.ohc</groupId> + <artifactId>ohc-core</artifactId> + </dependency> + <dependency> + <groupId>org.caffinitas.ohc</groupId> + <artifactId>ohc-core-j8</artifactId> + </dependency> + <dependency> + <groupId>com.github.ben-manes.caffeine</groupId> + <artifactId>caffeine</artifactId> + </dependency> + <dependency> + <groupId>org.jctools</groupId> + <artifactId>jctools-core</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </dependency> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>hppc</artifactId> + </dependency> + <dependency> + <groupId>org.gridkit.jvmtool</groupId> + <artifactId>sjk-cli</artifactId> + <version>0.14</version> + </dependency> + <dependency> + <groupId>org.gridkit.jvmtool</groupId> + <artifactId>sjk-core</artifactId> + </dependency> + <dependency> + <groupId>org.gridkit.jvmtool</groupId> + <artifactId>sjk-stacktrace</artifactId> + </dependency> + <dependency> + <groupId>org.gridkit.jvmtool</groupId> + <artifactId>mxdump</artifactId> + </dependency> + <dependency> + <groupId>org.gridkit.lab</groupId> + <artifactId>jvm-attach-api</artifactId> + </dependency> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>org.gridkit.jvmtool</groupId> + <artifactId>sjk-json</artifactId> + </dependency> + <dependency> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + </dependency> + <dependency> + <groupId>org.psjava</groupId> + <artifactId>psjava</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-tcnative-boringssl-static</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.hdrhistogram</groupId> + <artifactId>HdrHistogram</artifactId> + </dependency> - <dependency> - <groupId>de.jflex</groupId> - <artifactId>jflex</artifactId> - </dependency> + <dependency> + <groupId>com.github.rholder</groupId> + <artifactId>snowball-stemmer</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.concurrent-trees</groupId> + <artifactId>concurrent-trees</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + <dependency> + <groupId>net.ju-n.compile-command-annotations</groupId> + <artifactId>compile-command-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.byteman</groupId> + <artifactId>byteman-install</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.byteman</groupId> + <artifactId>byteman</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.byteman</groupId> + <artifactId>byteman-submit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.byteman</groupId> + <artifactId>byteman-bmunit</artifactId> + </dependency> + <dependency> + <groupId>com.github.seancfoley</groupId> + <artifactId>ipaddress</artifactId> + </dependency> + <dependency> + <groupId>ch.obermuhlner</groupId> + <artifactId>big-math</artifactId> + </dependency> + <dependency> + <groupId>org.agrona</groupId> + <artifactId>agrona</artifactId> + </dependency> + </dependencies> +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
