Skip to content

Commit 151120b

Browse files
Disable the cross-call to xalan-test pending decision on that.
1 parent ac9328b commit 151120b

File tree

1 file changed

+32
-71
lines changed

1 file changed

+32
-71
lines changed

integration-tests/pom.xml

Lines changed: 32 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -106,85 +106,46 @@
106106
the test source includes proof of recent run against that
107107
source, but deferrable.
108108
-->
109-
<plugin>
110-
<groupId>org.codehaus.mojo</groupId>
111-
<artifactId>exec-maven-plugin</artifactId>
112-
<version>3.5.1</version>
113-
<executions>
114-
<execution>
115-
<id>xalan-test attempt</id>
116-
<phase>pre-package</phase>
117-
<goals>
118-
<goal>exec</goal>
119-
</goals>
120-
</execution>
121-
</executions>
122-
<configuration>
123-
<executable>ant</executable>
124-
<workingDirectory>../../xalan-test</workingDirectory>
125-
<addOutputToClasspath>true</addOutputToClasspath>
126-
<addResourcesToClasspath>true</addResourcesToClasspath>
127-
<arguments>
128-
<!-- Make sure we're on Ant's classpath (something that
129-
the front-end xalan-test/build scripts we doing).
130-
This arguably should not be needed (especially now
131-
that we should no longer need endorsed or boot path
132-
overrides), but without it we don't resolve the
133-
XSLTC transformer factory class. Yes, that means
134-
the xalan-test ant build is sloppy. We knew that.
135-
-->
136-
<argument>-lib</argument>
137-
<argument>../xalan-java/build:../build:../xalan-java/lib/endorsed:../lib/endorsed</argument>
138-
139-
<argument>clean</argument>
140-
<argument>jar</argument>
141-
<argument>extensions.classes</argument>
142-
<argument>smoketest</argument>
143-
<argument>apitest</argument>
144-
<argument>conf.xsltc</argument>
145-
</arguments>
146-
</configuration>
147-
</plugin>
148109

149110
<!-- <plugin> -->
150-
<!-- <artifactId>maven-antrun-plugin</artifactId> -->
151-
<!-- <version>3.1.0</version> -->
111+
<!-- <groupId>org.codehaus.mojo</groupId> -->
112+
<!-- <artifactId>exec-maven-plugin</artifactId> -->
113+
<!-- <version>3.5.1</version> -->
152114
<!-- <executions> -->
153115
<!-- <execution> -->
154-
<!-- <id>xalan-test attempt</id> -->
155-
<!-- <phase>test</phase> -->
156-
<!-- <configuration> -->
157-
<!-- <target> -->
158-
<!-- <!-\- <ant> task is simpler. I'd hoped it would let us shift -->
159-
<!-- current directory (so we didn't have to add baseDir -->
160-
<!-- references to supporting code that assumed execution -->
161-
<!-- with working directory xalan-test), but current evidence -->
162-
<!-- is no such luck. -->
163-
<!-- <subant> doesn't, but lets us control failonerror and -->
164-
<!-- verbose. -->
165-
<!-- I'm *guessing* we may want inheritall. -->
166-
<!-- -\-> -->
167-
<!-- <subant -->
168-
<!-- buildpath="../../xalan-test/build.xml" -->
169-
<!-- genericantfile="../../xalan-test/build.xml" -->
170-
<!-- inheritall="true" -->
171-
<!-- failonerror="true" -->
172-
<!-- verbose="true" -->
173-
<!-- > -->
174-
<!-- <target name="clean"/> -->
175-
<!-- <target name="jar"/> -->
176-
<!-- <target name="extensions.classes"/> -->
177-
<!-- <target name="smoketest"/> -->
178-
<!-- <target name="apitest"/> -->
179-
<!-- <target name="conf.xsltc"/> -->
180-
<!-- </subant> -->
181-
<!-- </target> -->
182-
<!-- </configuration> -->
116+
<!-- <id>xalan-test attempt</id> -->
117+
<!-- <phase>pre-package</phase> -->
183118
<!-- <goals> -->
184-
<!-- <goal>run</goal> -->
119+
<!-- <goal>exec</goal> -->
185120
<!-- </goals> -->
186121
<!-- </execution> -->
187122
<!-- </executions> -->
123+
<!-- <configuration> -->
124+
<!-- <executable>ant</executable> -->
125+
<!-- <workingDirectory>../../xalan-test</workingDirectory> -->
126+
<!-- <addOutputToClasspath>true</addOutputToClasspath> -->
127+
<!-- <addResourcesToClasspath>true</addResourcesToClasspath> -->
128+
<!-- <arguments> -->
129+
<!-- <!-\- Use -lib to make sure we're on Ant's classpath -->
130+
<!-- (something that the front-end xalan-test/build -->
131+
<!-- scripts we doing). This arguably should not be -->
132+
<!-- needed (especially now that we should no longer -->
133+
<!-- need endorsed or boot path overrides), but without -->
134+
<!-- it the tests may not resolve the XSLTC transformer -->
135+
<!-- factory class. Yes, that means the xalan-test ant -->
136+
<!-- build is sloppy. We knew that. -->
137+
<!-- -\-> -->
138+
<!-- <argument>-lib</argument> -->
139+
<!-- <argument>../xalan-java/build:../build:../xalan-java/lib/endorsed:../lib/endorsed</argument> -->
140+
141+
<!-- <argument>clean</argument> -->
142+
<!-- <argument>jar</argument> -->
143+
<!-- <argument>extensions.classes</argument> -->
144+
<!-- <argument>smoketest</argument> -->
145+
<!-- <argument>apitest</argument> -->
146+
<!-- <argument>conf.xsltc</argument> -->
147+
<!-- </arguments> -->
148+
<!-- </configuration> -->
188149
<!-- </plugin> -->
189150

190151
</plugins>

0 commit comments

Comments
 (0)