Andrius Merkys pushed to branch master at Debian Java Maintainers / apache-cassandra
Commits: 59deaa77 by Andrius Merkys at 2019-09-05T13:28:17Z Updating a patch. - - - - - 80288042 by Andrius Merkys at 2019-09-05T13:30:35Z Using libthrift-java. - - - - - ae3facc3 by Andrius Merkys at 2019-09-05T13:41:37Z Adding /usr/share/java/slf4j-api.jar. - - - - - a49f9f9b by Andrius Merkys at 2019-09-05T13:50:25Z Adding /usr/share/java/commons-lang3.jar to the classpath. - - - - - 3 changed files: - debian/control - debian/patches/build.patch - debian/patches/disable-microbench.patch Changes: ===================================== debian/control ===================================== @@ -16,6 +16,7 @@ Build-Depends: libcommons-collections3-java, libcommons-io-java, libstringtemplate4-java, + libthrift-java, libunsafe-mock-java, junit, junit4, ===================================== debian/patches/build.patch ===================================== @@ -35,7 +35,7 @@ </condition> <condition property="is.source.artifact"> -@@ -153,15 +152,14 @@ +@@ -153,15 +152,16 @@ <!-- Add all the dependencies. --> @@ -43,20 +43,23 @@ + <path id="maven-ant-tasks.classpath" path="/usr/share/java/aether-ant-tasks.jar" /> <path id="cassandra.classpath"> <pathelement location="${build.classes.main}" /> - <pathelement location="${build.classes.thrift}" /> +- <pathelement location="${build.classes.thrift}" /> - <fileset dir="${build.lib}"> - <include name="**/*.jar" /> - <exclude name="**/*-sources.jar"/> - <exclude name="**/ant-*.jar"/> - </fileset> ++ <pathelement location="/usr/share/java/thrift.jar" /> + <pathelement location="/usr/share/java/aether-ant-tasks.jar" /> + <pathelement location="/usr/share/java/compile-command-annotations.jar" /> + <pathelement location="/usr/share/java/jsr305.jar" /> + <pathelement location="/usr/share/java/byteman-agent.jar" /> ++ <pathelement location="/usr/share/java/slf4j-api.jar" /> ++ <pathelement location="/usr/share/java/commons-lang3.jar" /> <fileset dir="${build.dir.lib}"> <include name="**/*.jar" /> <exclude name="**/*-sources.jar"/> -@@ -229,7 +227,7 @@ +@@ -229,7 +229,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" @@ -65,7 +68,7 @@ fork="true" failonerror="true"> <jvmarg value="-Xmx512M" /> -@@ -244,18 +242,6 @@ +@@ -244,18 +244,6 @@ </target> <target name="generate-cql-html" depends="maven-ant-tasks-init" description="Generate HTML from textile source"> @@ -84,7 +87,7 @@ </target> <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation"> -@@ -274,7 +260,7 @@ +@@ -274,7 +262,7 @@ grammar files --> <target name="generate-jflex-java" description="Generate Java from jflex grammar"> @@ -93,7 +96,7 @@ <jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" /> </target> -@@ -293,57 +279,10 @@ +@@ -293,57 +281,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> @@ -151,7 +154,7 @@ <property name="maven-ant-tasks.initialized" value="true"/> </target> -@@ -352,393 +291,12 @@ +@@ -352,393 +293,12 @@ in order to keep everything consistent --> <target name="maven-declare-dependencies" depends="maven-ant-tasks-init" description="Define dependencies and dependency versions"> @@ -545,7 +548,7 @@ </target> <target name="echo-base-version"> -@@ -840,7 +398,7 @@ +@@ -840,7 +400,7 @@ <src path="${build.src.java}"/> <src path="${build.src.gen-java}"/> <compilerarg value="-XDignore.symbol.file"/> @@ -554,7 +557,7 @@ <classpath refid="cassandra.classpath"/> </javac> <antcall target="createVersionPropFile"/> -@@ -899,13 +457,6 @@ +@@ -899,13 +459,6 @@ </testmacro> </target> @@ -568,7 +571,7 @@ <target name="write-poms" unless="without.maven"> <antcall target="_write-poms" /> </target> -@@ -1033,7 +584,6 @@ +@@ -1033,7 +586,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"> @@ -576,7 +579,7 @@ <fileset dir="${build.dir}"> <include name="${final.name}.jar" /> <include name="${ant.project.name}-thrift-${version}.jar" /> -@@ -1088,8 +638,6 @@ +@@ -1088,8 +640,6 @@ <include name="*.jar" /> </fileset> </copy> @@ -585,7 +588,7 @@ <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${final.name}-bin.tar.gz"> -@@ -1560,9 +1108,6 @@ +@@ -1560,9 +1110,6 @@ <!-- Use JaCoCo ant extension without needing externally saved lib --> <target name="jacoco-init" depends="maven-ant-tasks-init"> @@ -595,7 +598,7 @@ <typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/> </target> -@@ -1606,9 +1151,6 @@ +@@ -1606,9 +1153,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 -@@ -771,7 +771,6 @@ +@@ -762,7 +762,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/d159bacbdb41eb4139384a39ba047f3b089d323a...a49f9f9b530a1f721a99fb139ecaf9a7167a08c2 -- View it on GitLab: https://salsa.debian.org/java-team/apache-cassandra/compare/d159bacbdb41eb4139384a39ba047f3b089d323a...a49f9f9b530a1f721a99fb139ecaf9a7167a08c2 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