Skip to content

Commit 8e6d7fe

Browse files
committed
fix: add includeantruntime="false" parameter to javac ant builds
1 parent 183f315 commit 8e6d7fe

37 files changed

Lines changed: 59 additions & 55 deletions

File tree

modules/codegen/build-wsdls.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<classpath location="${compiled.classes.dir}" />
4646
<arg line="-ap -o ${wsdl.output.base.dir}/version -d none -s -u -uri test-resources/wsdls/Version.wsdl" />
4747
</java>
48-
<javac fork="yes" destdir="target/test-classes" debug="on">
48+
<javac fork="yes" destdir="target/test-classes" debug="on" includeantruntime="false">
4949
<classpath refid="maven.test.classpath" />
5050
<classpath location="${compiled.classes.dir}" />
5151
<src path="${wsdl.output.base.dir}/version" />

modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<target name="compile.src" depends="pre.compile.test">
127127
<xsl:attribute name="if">jars.ok</xsl:attribute>
128-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
128+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
129129
<xsl:attribute name="destdir">${classes}</xsl:attribute>
130130
<xsl:attribute name="srcdir">${src}</xsl:attribute>
131131
<classpath>
@@ -136,7 +136,7 @@
136136

137137
<target name="compile.test" depends="compile.src">
138138
<xsl:attribute name="if">jars.ok</xsl:attribute>
139-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
139+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
140140
<xsl:attribute name="destdir">${classes}</xsl:attribute>
141141
<src>
142142
<xsl:attribute name="path">${test}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
<target name="compile.src" depends="echo.classpath.problem">
124124
<xsl:attribute name="if">jars.ok</xsl:attribute>
125-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
125+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
126126
<xsl:attribute name="destdir">${classes}</xsl:attribute>
127127
<xsl:attribute name="srcdir">${src}</xsl:attribute>
128128
<classpath>
@@ -133,7 +133,7 @@
133133

134134
<target name="compile.test" depends="compile.src">
135135
<xsl:attribute name="if">jars.ok</xsl:attribute>
136-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
136+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
137137
<xsl:attribute name="destdir">${classes}</xsl:attribute>
138138
<xsl:attribute name="srcdir">${test}</xsl:attribute>
139139
<classpath>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131

132132
<target name="compile.src" depends="pre.compile.test" >
133133
<xsl:attribute name="if">jars.ok</xsl:attribute>
134-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
134+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
135135
<xsl:attribute name="destdir">${classes}</xsl:attribute>
136136
<xsl:attribute name="srcdir">${src}</xsl:attribute>
137137
<classpath>
@@ -143,7 +143,7 @@
143143

144144
<target name="compile.test" depends="compile.src">
145145
<xsl:attribute name="if">jars.ok</xsl:attribute>
146-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
146+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
147147
<xsl:attribute name="destdir">${classes}</xsl:attribute>
148148

149149
<src>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134

135135
<target name="compile.all" depends="pre.compile.test">
136136
<xsl:attribute name="if">jars.ok</xsl:attribute>
137-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
137+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
138138
<xsl:attribute name="destdir">${classes}</xsl:attribute>
139139
<xsl:attribute name="srcdir">${src}</xsl:attribute>
140140
<classpath>
@@ -147,7 +147,7 @@
147147
</target>
148148
<target name="compile.test" depends="pre.compile.test">
149149
<xsl:attribute name="if">jars.ok</xsl:attribute>
150-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
150+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
151151
<xsl:attribute name="destdir">${classes}</xsl:attribute>
152152
<src>
153153
<xsl:attribute name="path">${src}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130

131131
<target name="compile.src" depends="pre.compile.test">
132132
<xsl:attribute name="if">jars.ok</xsl:attribute>
133-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
133+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
134134
<xsl:attribute name="destdir">${classes}</xsl:attribute>
135135
<xsl:attribute name="srcdir">${src}</xsl:attribute>
136136
<classpath>
@@ -141,7 +141,7 @@
141141

142142
<target name="compile.test" depends="compile.src">
143143
<xsl:attribute name="if">jars.ok</xsl:attribute>
144-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
144+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
145145
<xsl:attribute name="destdir">${classes}</xsl:attribute>
146146
<src>
147147
<xsl:attribute name="path">${test}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142

143143
<target name="compile.src" depends="pre.compile.test" >
144144
<xsl:attribute name="if">jars.ok</xsl:attribute>
145-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
145+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
146146
<xsl:attribute name="destdir">${classes}</xsl:attribute>
147147
<xsl:attribute name="srcdir">${src}</xsl:attribute>
148148
<classpath>
@@ -157,7 +157,7 @@
157157

158158
<target name="compile.test" depends="compile.src">
159159
<xsl:attribute name="if">jars.ok</xsl:attribute>
160-
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
160+
<javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
161161
<xsl:attribute name="destdir">${classes}</xsl:attribute>
162162

163163
<src>

modules/fastinfoset/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<!-- make the dirs -->
197197
<mkdir dir="${wsdl.output.base.dir}" />
198198
<echo>Compiling Service class</echo>
199-
<javac fork="true" destdir="target/test-classes" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
199+
<javac fork="true" destdir="target/test-classes" debug="on" release="${maven.compiler.release}" includeantruntime="false">
200200
<classpath refid="maven.dependency.classpath" />
201201
<classpath location="${compiled.classes.dir}" />
202202
<include name="**/*SimpleAddService.java" />

modules/integration/test-resources/jaxrs/archiveTestModule/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<target name="compile" depends="init" unless="jars.uptodate">
3838
<mkdir dir="${build.classes}"/>
39-
<javac fork="true" destdir="${build.classes}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
39+
<javac fork="true" destdir="${build.classes}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}" includeantruntime="false">
4040
<classpath refid="axis.test.classpath"/>
4141
<src path="${src}"/>
4242
</javac>

modules/integration/test-resources/jaxrs/pojoTestModule/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<target name="compile" depends="init" unless="pojo.uptodate">
3434
<mkdir dir="${pojo.dir}"/>
35-
<javac fork="true" destdir="${pojo.dir}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
35+
<javac fork="true" destdir="${pojo.dir}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}" includeantruntime="false">
3636
<classpath refid="axis.test.classpath"/>
3737
<src path="${src}"/>
3838
</javac>

0 commit comments

Comments
 (0)