Skip to content

Commit cfd3f2e

Browse files
committed
tezjdk17: fixing xml parsing errors with nashorn dependency
1 parent a5ad614 commit cfd3f2e

7 files changed

Lines changed: 10 additions & 22 deletions

File tree

build-tools/test-patch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,8 @@ checkSpotbugsWarnings () {
539539

540540
rc=0
541541
echo " Running spotbugs "
542-
echo "$MVN clean test spotbugs:spotbugs -DskipTests < /dev/null > $PATCH_DIR/patchSpotBugsOutput.txt 2>&1"
543-
$MVN clean test spotbugs:spotbugs -DskipTests < /dev/null > $PATCH_DIR/patchSpotBugsOutput.txt 2>&1
542+
echo "$MVN clean test com.github.spotbugs:spotbugs-maven-plugin:4.9.3.0:spotbugs -DskipTests < /dev/null > $PATCH_DIR/patchSpotBugsOutput.txt 2>&1"
543+
$MVN clean test com.github.spotbugs:spotbugs-maven-plugin:4.9.3.0:spotbugs -DskipTests < /dev/null > $PATCH_DIR/patchSpotBugsOutput.txt 2>&1
544544
rc=$?
545545
spotbugs_version=$(${AWK} 'match($0, /spotbugs-maven-plugin:[^:]*:spotbugs/) { print substr($0, RSTART + 22, RLENGTH - 31); exit }' "${PATCH_DIR}/patchSpotBugsOutput.txt")
546546

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,14 @@
812812
</dependencies>
813813
</dependencyManagement>
814814

815+
<dependencies>
816+
<dependency>
817+
<groupId>org.openjdk.nashorn</groupId>
818+
<artifactId>nashorn-core</artifactId>
819+
<version>${nashorn.version}</version>
820+
</dependency>
821+
</dependencies>
822+
815823
<modules>
816824
<module>hadoop-shim</module>
817825
<module>tez-api</module>

tez-api/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
</properties>
3030

3131
<dependencies>
32-
<dependency>
33-
<groupId>org.openjdk.nashorn</groupId>
34-
<artifactId>nashorn-core</artifactId>
35-
</dependency>
3632
<dependency>
3733
<groupId>org.slf4j</groupId>
3834
<artifactId>slf4j-api</artifactId>

tez-dag/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
<artifactId>tez-dag</artifactId>
3737

3838
<dependencies>
39-
<dependency>
40-
<groupId>org.openjdk.nashorn</groupId>
41-
<artifactId>nashorn-core</artifactId>
42-
</dependency>
4339
<dependency>
4440
<groupId>org.apache.tez</groupId>
4541
<artifactId>hadoop-shim</artifactId>

tez-ext-service-tests/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
</properties>
3131

3232
<dependencies>
33-
<dependency>
34-
<groupId>org.openjdk.nashorn</groupId>
35-
<artifactId>nashorn-core</artifactId>
36-
</dependency>
3733
<dependency>
3834
<groupId>io.netty</groupId>
3935
<artifactId>netty-all</artifactId>

tez-runtime-internals/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<artifactId>tez-runtime-internals</artifactId>
2626

2727
<dependencies>
28-
<dependency>
29-
<groupId>org.openjdk.nashorn</groupId>
30-
<artifactId>nashorn-core</artifactId>
31-
</dependency>
3228
<dependency>
3329
<groupId>commons-lang</groupId>
3430
<artifactId>commons-lang</artifactId>

tez-tests/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
</properties>
3030

3131
<dependencies>
32-
<dependency>
33-
<groupId>org.openjdk.nashorn</groupId>
34-
<artifactId>nashorn-core</artifactId>
35-
</dependency>
3632
<dependency>
3733
<groupId>org.apache.tez</groupId>
3834
<artifactId>tez-api</artifactId>

0 commit comments

Comments
 (0)