|
40 | 40 | <property name="build.src.gen-java" value="${basedir}/src/gen-java"/> |
41 | 41 | <property name="build.lib" value="${basedir}/lib"/> |
42 | 42 | <property name="build.dir" value="${basedir}/build"/> |
| 43 | + <property name="build.scylla-jmx-parent" value="${basedir}/scylla-jmx/scylla-jmx-parent/"/> |
| 44 | + <property name="build.scylla-apiclient" value="${basedir}/scylla-jmx/scylla-apiclient/target"/> |
43 | 45 | <property name="build.dir.lib" value="${basedir}/build/lib"/> |
44 | 46 | <property name="build.test.dir" value="${build.dir}/test"/> |
45 | 47 | <property name="build.classes" value="${build.dir}/classes"/> |
|
166 | 168 | <exclude name="**/*-sources.jar"/> |
167 | 169 | <exclude name="**/ant-*.jar"/> |
168 | 170 | </fileset> |
| 171 | + <fileset dir="${build.scylla-apiclient}"> |
| 172 | + <include name="**/scylla-apiclient*.jar" /> |
| 173 | + <exclude name="**/*-sources.jar"/> |
| 174 | + <exclude name="**/ant-*.jar"/> |
| 175 | + </fileset> |
169 | 176 | </path> |
170 | 177 |
|
171 | 178 | <macrodef name="create-javadoc"> |
|
453 | 460 | <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" /> |
454 | 461 | <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/> |
455 | 462 | <dependency groupId="org.ow2.asm" artifactId="asm" version="5.0.4" /> |
| 463 | + |
| 464 | + <dependency groupId="org.glassfish.jersey.core" artifactId="jersey-common" version="2.22.1" /> |
| 465 | + <dependency groupId="javax.ws.rs" artifactId="javax.ws.rs-api" version="2.0.1" /> |
| 466 | + <dependency groupId="javax.ws.rs" artifactId="jsr311-api" version="1.1.1" /> |
| 467 | + <dependency groupId="org.glassfish.jersey.core" artifactId="jersey-client" version="2.22.1" /> |
| 468 | + <dependency groupId="org.glassfish" artifactId="javax.json" version="1.0.4" /> |
| 469 | + <dependency groupId="javax.activation" artifactId="activation" version="1.1" /> |
| 470 | + <dependency groupId="com.google.guava" artifactId="guava" version="18.0" /> |
| 471 | + <dependency groupId="com.google.collections" artifactId="google-collections" version="1.0" /> |
| 472 | + <dependency groupId="javax.activation" artifactId="activation" version="1.1" /> |
| 473 | + <dependency groupId="javax.annotation" artifactId="javax.annotation-api" version="1.2" /> |
| 474 | + <dependency groupId="org.glassfish.jersey.bundles.repackaged" artifactId="jersey-guava" version="2.22.1" /> |
| 475 | + |
456 | 476 | </dependencyManagement> |
457 | 477 | <developer id="adelapena" name="Andres de la Peña"/> |
458 | 478 | <developer id="alakshman" name="Avinash Lakshman"/> |
|
816 | 836 | depends="maven-ant-tasks-retrieve-build,build-project" description="Compile Cassandra classes"/> |
817 | 837 | <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/> |
818 | 838 |
|
819 | | - <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java" |
| 839 | + <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,mvn-scylla-apiclient-jar" |
820 | 840 | name="build-project"> |
821 | 841 | <echo message="${ant.project.name}: ${ant.file}"/> |
822 | 842 | <!-- Order matters! --> |
|
1054 | 1074 | </jar> |
1055 | 1075 | </target> |
1056 | 1076 |
|
| 1077 | + <target name="mvn-scylla-apiclient-jar"> |
| 1078 | + <artifact:mvn mavenVersion="${maven.version}" pom="${build.scylla-jmx-parent}/pom.xml"> |
| 1079 | + <arg value="-pl"/> |
| 1080 | + <arg value=":scylla-apiclient"/> |
| 1081 | + <arg value="package"/> |
| 1082 | + </artifact:mvn> |
| 1083 | + <copy todir="${build.lib}"> |
| 1084 | + <fileset dir="${build.scylla-apiclient}" includes="*.jar"/> |
| 1085 | + </copy> |
| 1086 | + </target> |
| 1087 | + |
1057 | 1088 | <!-- creates release tarballs --> |
1058 | 1089 | <target name="artifacts" depends="jar,javadoc,gen-doc" |
1059 | 1090 | description="Create Cassandra release artifacts"> |
|
1069 | 1100 | <include name="${final.scylla-tools.name}.jar" /> |
1070 | 1101 | <include name="${ant.project.name}-thrift-${version}.jar" /> |
1071 | 1102 | </fileset> |
| 1103 | + <fileset dir="${build.scylla-apiclient}" includes="*.jar"/> |
1072 | 1104 | </copy> |
1073 | 1105 | <copy todir="${dist.dir}/javadoc"> |
1074 | 1106 | <fileset dir="${javadoc.dir}"/> |
|
1216 | 1248 | <include name="commons*.jar"/> |
1217 | 1249 | </zipgroupfileset> |
1218 | 1250 | <zipgroupfileset dir="${build.lib}" includes="*.jar"/> |
| 1251 | + <zipgroupfileset dir="${build.scylla-apiclient}" includes="*.jar"/> |
1219 | 1252 | </jar> |
1220 | 1253 | <jar jarfile="${build.test.dir}/benchmarks.jar"> |
1221 | 1254 | <manifest> |
|
0 commit comments