Andrius Merkys pushed to branch master at Debian Java Maintainers / apache-cassandra
Commits: 9eac8b54 by Andrius Merkys at 2019-09-10T12:46:14Z Removing generated thrift source. - - - - - 31aef4a0 by Andrius Merkys at 2019-09-10T12:59:55Z Adding /usr/share/java/guava.jar to the classpath. - - - - - 54ed891e by Andrius Merkys at 2019-09-10T13:05:50Z Adding /usr/share/java/jamm.jar to the classpath. - - - - - c42dc16e by Andrius Merkys at 2019-09-10T13:12:41Z Adding missing b-dep on libcompile-command-annotations-java. - - - - - 31cebb58 by Andrius Merkys at 2019-09-10T13:20:09Z Using libjson-simple-java. - - - - - 5f77f38e by Andrius Merkys at 2019-09-10T13:59:03Z Using /usr/share/java/netty-buffer.jar. - - - - - e3c87960 by Andrius Merkys at 2019-09-10T14:10:24Z Adding /usr/share/java/netty-common.jar to classpath. - - - - - eaaeb8d1 by Andrius Merkys at 2019-09-24T06:15:01Z Using libstream-java. - - - - - a434ab60 by Andrius Merkys at 2019-09-25T06:10:51Z Using libdropwizard-metrics-java. - - - - - bb898291 by Andrius Merkys at 2019-09-25T06:41:05Z Using liblz4-java. - - - - - 99a6414a by Andrius Merkys at 2019-09-25T06:48:49Z Using libjbcrypt-java. - - - - - 4 changed files: - debian/control - debian/patches/build.patch - debian/patches/disable-microbench.patch - debian/rules Changes: ===================================== debian/control ===================================== @@ -15,6 +15,14 @@ Build-Depends: libbyteman-java, libcommons-collections3-java, libcommons-io-java, + libcompile-command-annotations-java, + libdropwizard-metrics-java, + libjamm-java, + libjbcrypt-java, + libjson-simple-java, + liblz4-java, + libnetty-java, + libstream-java, libstringtemplate4-java, libthrift-java, libunsafe-mock-java, ===================================== debian/patches/build.patch ===================================== @@ -35,7 +35,7 @@ </condition> <condition property="is.source.artifact"> -@@ -153,15 +152,16 @@ +@@ -153,15 +152,25 @@ <!-- Add all the dependencies. --> @@ -56,10 +56,19 @@ + <pathelement location="/usr/share/java/byteman-agent.jar" /> + <pathelement location="/usr/share/java/slf4j-api.jar" /> + <pathelement location="/usr/share/java/commons-lang3.jar" /> ++ <pathelement location="/usr/share/java/guava.jar" /> ++ <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-buffer.jar" /> ++ <pathelement location="/usr/share/java/stream.jar" /> ++ <pathelement location="/usr/share/java/metrics-core.jar" /> ++ <pathelement location="/usr/share/java/lz4.jar" /> ++ <pathelement location="/usr/share/java/jbcrypt.jar" /> <fileset dir="${build.dir.lib}"> <include name="**/*.jar" /> <exclude name="**/*-sources.jar"/> -@@ -229,7 +229,7 @@ +@@ -229,7 +238,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" @@ -68,7 +77,7 @@ fork="true" failonerror="true"> <jvmarg value="-Xmx512M" /> -@@ -244,18 +244,6 @@ +@@ -244,18 +253,6 @@ </target> <target name="generate-cql-html" depends="maven-ant-tasks-init" description="Generate HTML from textile source"> @@ -87,7 +96,7 @@ </target> <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation"> -@@ -274,7 +262,7 @@ +@@ -274,7 +271,7 @@ grammar files --> <target name="generate-jflex-java" description="Generate Java from jflex grammar"> @@ -96,7 +105,7 @@ <jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" /> </target> -@@ -293,57 +281,10 @@ +@@ -293,57 +290,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> @@ -154,7 +163,7 @@ <property name="maven-ant-tasks.initialized" value="true"/> </target> -@@ -352,393 +293,12 @@ +@@ -352,393 +302,12 @@ in order to keep everything consistent --> <target name="maven-declare-dependencies" depends="maven-ant-tasks-init" description="Define dependencies and dependency versions"> @@ -548,7 +557,7 @@ </target> <target name="echo-base-version"> -@@ -840,7 +400,7 @@ +@@ -840,7 +409,7 @@ <src path="${build.src.java}"/> <src path="${build.src.gen-java}"/> <compilerarg value="-XDignore.symbol.file"/> @@ -557,7 +566,7 @@ <classpath refid="cassandra.classpath"/> </javac> <antcall target="createVersionPropFile"/> -@@ -899,13 +459,6 @@ +@@ -899,13 +468,6 @@ </testmacro> </target> @@ -571,7 +580,7 @@ <target name="write-poms" unless="without.maven"> <antcall target="_write-poms" /> </target> -@@ -1033,7 +586,6 @@ +@@ -1033,7 +595,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"> @@ -579,7 +588,7 @@ <fileset dir="${build.dir}"> <include name="${final.name}.jar" /> <include name="${ant.project.name}-thrift-${version}.jar" /> -@@ -1088,8 +640,6 @@ +@@ -1088,8 +649,6 @@ <include name="*.jar" /> </fileset> </copy> @@ -588,7 +597,7 @@ <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${final.name}-bin.tar.gz"> -@@ -1560,9 +1110,6 @@ +@@ -1560,9 +1119,6 @@ <!-- Use JaCoCo ant extension without needing externally saved lib --> <target name="jacoco-init" depends="maven-ant-tasks-init"> @@ -598,7 +607,7 @@ <typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/> </target> -@@ -1606,9 +1153,6 @@ +@@ -1606,9 +1162,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 -@@ -762,7 +762,6 @@ +@@ -772,7 +772,6 @@ <src path="${test.unit.src}"/> <src path="${test.long.src}"/> <src path="${test.burn.src}"/> ===================================== debian/rules ===================================== @@ -16,6 +16,7 @@ override_dh_auto_configure: rm ./test/unit/org/apache/cassandra/hadoop/ColumnFamilyInputFormatTest.java rm ./test/unit/org/apache/cassandra/io/util/SafeMemoryWriterTest.java rm ./test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java + rm ./interface/thrift/gen-java/org/apache/cassandra/thrift/*.java dh_auto_configure override_dh_install: View it on GitLab: https://salsa.debian.org/java-team/apache-cassandra/compare/a49f9f9b530a1f721a99fb139ecaf9a7167a08c2...99a6414ac40fd02edd780ce2291b91304ff8da89 -- View it on GitLab: https://salsa.debian.org/java-team/apache-cassandra/compare/a49f9f9b530a1f721a99fb139ecaf9a7167a08c2...99a6414ac40fd02edd780ce2291b91304ff8da89 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits