[Git][java-team/apache-cassandra][master] 6 commits: Using /usr/share/java/netty-transport.jar and /usr/share/java/netty-handler.jar.
Andrius Merkys (@merkys)
gitlab at salsa.debian.org
Mon Jan 22 12:57:05 GMT 2024
Andrius Merkys pushed to branch master at Debian Java Maintainers / apache-cassandra
Commits:
3a56c522 by Andrius Merkys at 2019-09-25T03:22:29-04:00
Using /usr/share/java/netty-transport.jar and /usr/share/java/netty-handler.jar.
- - - - -
1b2672d6 by Andrius Merkys at 2019-09-25T03:44:07-04:00
Using libsnappy-java.
- - - - -
64a8cc47 by Andrius Merkys at 2019-09-26T01:21:52-04:00
Using /usr/share/java/metrics-jvm.jar.
- - - - -
eb72e025 by Andrius Merkys at 2019-09-26T01:34:20-04:00
Using libjackson-json-java.
- - - - -
8427c326 by Andrius Merkys at 2019-09-26T01:50:50-04:00
Using /usr/share/java/netty-transport-native-epoll.jar.
- - - - -
25faba9a by Andrius Merkys at 2019-09-26T02:01:05-04:00
Using /usr/share/java/netty-codec.jar.
- - - - -
3 changed files:
- debian/control
- debian/patches/build.patch
- debian/patches/disable-microbench.patch
Changes:
=====================================
debian/control
=====================================
@@ -17,11 +17,13 @@ Build-Depends:
libcommons-io-java,
libcompile-command-annotations-java,
libdropwizard-metrics-java,
+ libjackson-json-java,
libjamm-java,
libjbcrypt-java,
libjson-simple-java,
liblz4-java,
libnetty-java,
+ libsnappy-java,
libstream-java,
libstringtemplate4-java,
libthrift-java,
=====================================
debian/patches/build.patch
=====================================
@@ -35,7 +35,7 @@
</condition>
<condition property="is.source.artifact">
-@@ -153,15 +152,25 @@
+@@ -153,15 +152,33 @@
<!--
Add all the dependencies.
-->
@@ -60,15 +60,23 @@
+ <pathelement location="/usr/share/java/jamm.jar" />
+ <pathelement location="/usr/share/java/json-simple.jar" />
+ <pathelement location="/usr/share/java/netty-common.jar" />
++ <pathelement location="/usr/share/java/netty-codec.jar" />
+ <pathelement location="/usr/share/java/netty-buffer.jar" />
++ <pathelement location="/usr/share/java/netty-transport.jar" />
++ <pathelement location="/usr/share/java/netty-handler.jar" />
++ <pathelement location="/usr/share/java/netty-transport-native-epoll.jar" />
+ <pathelement location="/usr/share/java/stream.jar" />
+ <pathelement location="/usr/share/java/metrics-core.jar" />
++ <pathelement location="/usr/share/java/metrics-jvm.jar" />
+ <pathelement location="/usr/share/java/lz4.jar" />
+ <pathelement location="/usr/share/java/jbcrypt.jar" />
++ <pathelement location="/usr/share/java/snappy-java.jar" />
++ <pathelement location="/usr/share/java/jackson-core-asl.jar" />
++ <pathelement location="/usr/share/java/jackson-mapper-asl.jar" />
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
-@@ -229,7 +238,7 @@
+@@ -229,7 +246,7 @@
<target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
<echo>Building Grammar ${build.src.antlr}/Cql.g ...</echo>
<java classname="org.antlr.Tool"
@@ -77,7 +85,7 @@
fork="true"
failonerror="true">
<jvmarg value="-Xmx512M" />
-@@ -244,18 +253,6 @@
+@@ -244,18 +261,6 @@
</target>
<target name="generate-cql-html" depends="maven-ant-tasks-init" description="Generate HTML from textile source">
@@ -96,7 +104,7 @@
</target>
<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
-@@ -274,7 +271,7 @@
+@@ -274,7 +279,7 @@
grammar files
-->
<target name="generate-jflex-java" description="Generate Java from jflex grammar">
@@ -105,7 +113,7 @@
<jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
</target>
-@@ -293,57 +290,10 @@
+@@ -293,57 +298,10 @@
<target name="maven-ant-tasks-download" depends="init,maven-ant-tasks-localrepo" unless="maven-ant-tasks.jar.exists"
description="Fetch Maven ANT Tasks from Maven Central Repositroy">
<echo>Downloading Maven ANT Tasks...</echo>
@@ -163,7 +171,7 @@
<property name="maven-ant-tasks.initialized" value="true"/>
</target>
-@@ -352,393 +302,12 @@
+@@ -352,393 +310,12 @@
in order to keep everything consistent -->
<target name="maven-declare-dependencies" depends="maven-ant-tasks-init"
description="Define dependencies and dependency versions">
@@ -557,7 +565,7 @@
</target>
<target name="echo-base-version">
-@@ -840,7 +409,7 @@
+@@ -840,7 +417,7 @@
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<compilerarg value="-XDignore.symbol.file"/>
@@ -566,7 +574,7 @@
<classpath refid="cassandra.classpath"/>
</javac>
<antcall target="createVersionPropFile"/>
-@@ -899,13 +468,6 @@
+@@ -899,13 +476,6 @@
</testmacro>
</target>
@@ -580,7 +588,7 @@
<target name="write-poms" unless="without.maven">
<antcall target="_write-poms" />
</target>
-@@ -1033,7 +595,6 @@
+@@ -1033,7 +603,6 @@
<fixcrlf srcdir="conf" includes="**/*" excludes="**/*.bat, **/*.ps1" eol="lf" eof="remove" />
<fixcrlf srcdir="tools/bin" includes="**/*" excludes="**/*.bat, **/*.ps1" eol="lf" eof="remove" />
<copy todir="${dist.dir}/lib">
@@ -588,7 +596,7 @@
<fileset dir="${build.dir}">
<include name="${final.name}.jar" />
<include name="${ant.project.name}-thrift-${version}.jar" />
-@@ -1088,8 +649,6 @@
+@@ -1088,8 +657,6 @@
<include name="*.jar" />
</fileset>
</copy>
@@ -597,7 +605,7 @@
<tar compression="gzip" longfile="gnu"
destfile="${build.dir}/${final.name}-bin.tar.gz">
-@@ -1560,9 +1119,6 @@
+@@ -1560,9 +1127,6 @@
<!-- Use JaCoCo ant extension without needing externally saved lib -->
<target name="jacoco-init" depends="maven-ant-tasks-init">
@@ -607,7 +615,7 @@
<typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/>
</target>
-@@ -1606,9 +1162,6 @@
+@@ -1606,9 +1170,6 @@
License audit tool
-->
<target name="rat-init" depends="maven-ant-tasks-init">
=====================================
debian/patches/disable-microbench.patch
=====================================
@@ -1,6 +1,6 @@
--- a/build.xml
+++ b/build.xml
-@@ -772,7 +772,6 @@
+@@ -780,7 +780,6 @@
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>
<src path="${test.burn.src}"/>
View it on GitLab: https://salsa.debian.org/java-team/apache-cassandra/-/compare/99a6414ac40fd02edd780ce2291b91304ff8da89...25faba9a71523fe906b29d3e36acad5b90bb9f56
--
View it on GitLab: https://salsa.debian.org/java-team/apache-cassandra/-/compare/99a6414ac40fd02edd780ce2291b91304ff8da89...25faba9a71523fe906b29d3e36acad5b90bb9f56
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240122/0bc3f415/attachment.htm>
More information about the pkg-java-commits
mailing list