Skip to content

Commit 842400f

Browse files
vladbailescuvladbailescu
authored
Update embedded jsoup library (#267)
* Added optional package imports for `org.jspecify.annotations` (which are specified by newer jsoup versions) * Also updated Chrome and Selenium test versions to re-enable integration tests
1 parent b2b6cf3 commit 842400f

File tree

4 files changed

+34
-17
lines changed

4 files changed

+34
-17
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22

33
orbs:
44
codecov: codecov/codecov@1.1.1
5-
browser-tools: circleci/browser-tools@1.2.4
5+
browser-tools: circleci/browser-tools@1.4.8
66

77
common:
88
restore_cache: &restore_cache
@@ -42,7 +42,8 @@ common:
4242
selenium_test_steps: &selenium_test_steps
4343
steps:
4444
- checkout
45-
- browser-tools/install-browser-tools
45+
- browser-tools/install-browser-tools:
46+
chrome-version: "116.0.5845.96"
4647
- *restore_cache
4748
- attach_workspace:
4849
at: /home/circleci/build
@@ -196,4 +197,4 @@ workflows:
196197
only: /.*/
197198
requires:
198199
- build-java-11
199-
- build-java-8
200+
- build-java-8

‎bundles/core/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<Import-Package>
8383
javax.annotation;version=0.0.0,
8484
com.day.cq.dam.api;version="[1.24,2.0)",
85+
org.jspecify.annotations;version=!;resolution:=optional,
8586
*
8687
</Import-Package>
8788
<Embed-Dependency>jsoup;inline=true</Embed-Dependency>
@@ -541,7 +542,7 @@
541542
<dependency>
542543
<groupId>org.jsoup</groupId>
543544
<artifactId>jsoup</artifactId>
544-
<version>1.13.1</version>
545+
<version>1.17.2</version>
545546
</dependency>
546547
<dependency>
547548
<groupId>com.sun.xml.bind</groupId>

‎bundles/core/src/test/resources/testpage/output_without_style.html‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<html>
22
<head>
3-
<title>Hello</title>
4-
<!--[if mso]>
3+
<title>Hello</title> <!--[if mso]>
54
<style>.hide-mso {
65
display: none;
76
}</style><![endif]-->
87
</head>
98
<body>
109
<h1>Hello</h1>
11-
<p>World</p>
12-
<img src="aempic.png" height="128" width="128" class="border">
10+
<p>World</p><img src="aempic.png" height="128" width="128" class="border">
1311
<table class="layout">
1412
<tbody>
1513
<tr>
@@ -26,8 +24,8 @@ <h1>Hello</h1>
2624
<table class="layout" width="640" border="0" cellpadding="0" cellspacing="0" role="presentation">
2725
<tbody>
2826
<tr>
29-
<td width="33.33%" class="layout-column"> One Third</td>
30-
<td width="66.67%" class="layout-column"> Two Third</td>
27+
<td width="33.33%" class="layout-column">One Third</td>
28+
<td width="66.67%" class="layout-column">Two Third</td>
3129
</tr>
3230
</tbody>
3331
</table>
@@ -38,11 +36,21 @@ <h3>Blocked subtitle</h3>
3836
<div class="footer">
3937
<h2>Examples</h2>
4038
<h3 class="example" style="border: 3px solid green;">Headline with border</h3>
41-
<div> This headline has the following CSS properties set in the style attribute: border: 3px solid green; <br> In addition, the style
42-
element has those definitions: h3.example {border-bottom-width: 12px}. <br> In this case the border should have 3px because the element style attribute has a higher priority. </div>
39+
<div>
40+
This headline has the following CSS properties set in the style attribute: border: 3px solid green;
41+
<br>
42+
In addition, the style element has those definitions: h3.example {border-bottom-width: 12px}.
43+
<br>
44+
In this case the border should have 3px because the element style attribute has a higher priority.
45+
</div>
4346
<h3 class="example2" style="border-bottom-width: 12px;">Headline with wider bottom-border</h3>
44-
<div> This headline has the following CSS properties set in the style attribute: border-bottom-width: 12px <br> In addition, the
45-
style element has those definitions: h3.example2 {border: 3px solid green;}. <br> In this case the bottom-border should have 12px because the element style attribute has a higher priority. </div>
47+
<div>
48+
This headline has the following CSS properties set in the style attribute: border-bottom-width: 12px
49+
<br>
50+
In addition, the style element has those definitions: h3.example2 {border: 3px solid green;}.
51+
<br>
52+
In this case the bottom-border should have 12px because the element style attribute has a higher priority.
53+
</div>
4654
</div>
4755
</body>
48-
</html>
56+
</html>

‎testing/it/e2e-selenium/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,9 @@
155155
<excludedGroups>failing,nested</excludedGroups>
156156
<granite.it.author.url>http://localhost:4502</granite.it.author.url>
157157
<granite.it.publish.url>http://localhost:4503</granite.it.publish.url>
158-
<selenide.version>6.10.1</selenide.version>
159-
<selenium.version>4.7.1</selenium.version>
158+
<selenide.version>6.17.0</selenide.version>
159+
<selenium.version>4.11.0</selenium.version>
160+
<webdrivermanager.version>5.4.1</webdrivermanager.version>
160161
</properties>
161162

162163
<profiles>
@@ -295,6 +296,12 @@
295296
<version>${selenide.version}</version>
296297
<scope>provided</scope>
297298
</dependency>
299+
<dependency>
300+
<groupId>io.github.bonigarcia</groupId>
301+
<artifactId>webdrivermanager</artifactId>
302+
<version>${webdrivermanager.version}</version>
303+
<scope>test</scope>
304+
</dependency>
298305
<dependency>
299306
<groupId>org.apache.commons</groupId>
300307
<artifactId>commons-exec</artifactId>

0 commit comments

Comments
 (0)