Skip to content

Commit 3cd3ee9

Browse files
committed
testng: Replace bundled jquery with CDN link
1 parent d94877f commit 3cd3ee9

File tree

2 files changed

+38
-4
lines changed

2 files changed

+38
-4
lines changed

downstream.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ function prep()
9898
rm -r downstream/jansi/src/main/native/
9999
elif [[ "$p" == jflex ]]; then
100100
rm -r downstream/jflex/jflex/examples/
101-
elif [[ "$p" == testng ]]; then
102-
mkdir -p downstream/testng/src/main/resources/META-INF/webjars/jquery/3.5.1
103-
rm -rf downstream/testng/src/test/
104-
>downstream/testng/src/main/resources/META-INF/webjars/jquery/3.5.1/jquery.min.js
105101
fi
106102
$git -C "downstream/$p" commit --allow-empty -a -m 'Remove binary files'
107103
$git -C "downstream/$p" checkout -b downstream upstream-base
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From da53b94030bcda82dc9409a36364c53dcfacf275 Mon Sep 17 00:00:00 2001
2+
From: Michael Simacek <msimacek@redhat.com>
3+
Date: Wed, 18 Jul 2018 15:57:49 +0200
4+
Subject: [PATCH] Replace bundled jquery with CDN link
5+
6+
---
7+
src/main/java/org/testng/reporters/jq/Main.java | 1 -
8+
src/main/resources/org/testng/header | 2 +-
9+
2 files changed, 1 insertion(+), 2 deletions(-)
10+
11+
diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java
12+
index efd6799a..2d8b74e1 100644
13+
--- a/src/main/java/org/testng/reporters/jq/Main.java
14+
+++ b/src/main/java/org/testng/reporters/jq/Main.java
15+
@@ -21,7 +21,6 @@ public class Main implements IReporter {
16+
private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
17+
private static final String[] RESOURCES =
18+
new String[] {
19+
- "jquery.min.js",
20+
"testng-reports.css",
21+
"testng-reports.js",
22+
"testng-reports1.css",
23+
diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
24+
index f5abbc3e..817badce 100644
25+
--- a/src/main/resources/org/testng/header
26+
+++ b/src/main/resources/org/testng/header
27+
@@ -7,7 +7,7 @@
28+
29+
<link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
30+
<link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
31+
- <script type="text/javascript" src="jquery.min.js"></script>
32+
+ <script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
33+
<script type="text/javascript" src="testng-reports.js"></script>
34+
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
35+
<script type='text/javascript'>
36+
--
37+
2.35.3
38+

0 commit comments

Comments
 (0)