Skip to content

Commit f9c2e51

Browse files
committed
Update build-docker.xml to include also prom dependencies in the classpath
1 parent 7ccc507 commit f9c2e51

File tree

1 file changed

+10
-29
lines changed

1 file changed

+10
-29
lines changed

build-docker.xml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,40 +43,21 @@
4343
<target name="retrieve">
4444
<mkdir dir="${lib.dir}"/> <!-- Ensure lib directory exists -->
4545
<ivy:retrieve type="jar,bundle" sync="true" haltonfailure="false" />
46-
<ivy:retrieve pattern="${lib.dir}/[artifact]-[revision].[ext]" conf="lib" type="jar,bundle" sync="true"/>
46+
<ivy:retrieve pattern="${lib.dir}/[artifact]-[revision].[ext]" conf="lib,default" type="jar,bundle"
47+
sync="true"/>
4748
</target>
4849

49-
<path id="classpath">
50-
<pathelement path="${bin.dir}" />
51-
<pathelement path="${java.class.path}" />
52-
<fileset dir=".">
53-
<include name="ivy/**/*.jar" />
54-
<include name="lib/**/*.jar" />
55-
<!--include name="stdlib/**/*.jar" />
56-
<include name="packagelib/**/*.jar" /-->
57-
</fileset>
58-
</path>
59-
6050
<!-- Target for compiling Java source files -->
6151
<target name="compile">
6252
<mkdir dir="${bin.dir}"/>
63-
<!-- <javac srcdir="${src.dir}" destdir="${bin.dir}">-->
64-
<!-- <classpath>-->
65-
<!-- &lt;!&ndash; Include all JARs from the lib directory (retrieved by Ivy) &ndash;&gt;-->
66-
<!-- <fileset dir="${lib.dir}">-->
67-
<!-- <include name="*.jar"/>-->
68-
<!-- </fileset>-->
69-
<!-- </classpath>-->
70-
<!-- </javac>-->
71-
<sequential>
72-
<!-- Compile the java code from ${src}-@{module} into ${build} -->
73-
<javac srcdir="${src.dir}" classpathref="classpath" destdir="${bin.dir}" nowarn="false" verbose="no"
74-
debug="true" debuglevel="lines,vars,source" deprecation="yes" source="1.8"
75-
target="1.8">
76-
<!-- Check for unsafe operations -->
77-
<compilerarg value="-Xlint:unchecked" />
78-
</javac>
79-
</sequential>
53+
<javac srcdir="${src.dir}" destdir="${bin.dir}">
54+
<classpath>
55+
<!-- Include all JARs from the lib directory (retrieved by Ivy) -->
56+
<fileset dir="${lib.dir}">
57+
<include name="*.jar"/>
58+
</fileset>
59+
</classpath>
60+
</javac>
8061
</target>
8162

8263
<target name="set-classpath" depends="retrieve, compile">

0 commit comments

Comments
 (0)