Skip to content

Commit 3378456

Browse files
jonathanaustinjonathanaustin
authored
Merge pull request #1880 from BorderTech/feature/merge-latest-georgie
Merge latest georgie version
2 parents b2b032b + b28bb2f commit 3378456

File tree

88 files changed

+1153
-1172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1153
-1172
lines changed

‎.github/workflows/github-actions-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
echo "Sonar secure variables NOT available"
4949
else
5050
echo "Sonar secure variables ARE available"
51-
mvn -B sonar:sonar -Dsonar.projectKey="bordertech-wcomponents" -Dsonar.organization="bordertech-github" -Dsonar.host.url="https://sonarcloud.io"
51+
mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey="bordertech-wcomponents" -Dsonar.organization="bordertech-github" -Dsonar.host.url="https://sonarcloud.io" -Dsonar.qualitygate.wait=true
5252
fi
5353
env:
5454
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,51 @@ Client Side API:
3030
### Bug Fixes
3131
* SelectToggle label attribute fix, `wc-data-for` > `data-wc-for`.
3232

33+
## 1.5.39
34+
35+
### API Changes
36+
* Updated AbstractRequest to remove deprecated methods uploadFileItems and readBytes (were protected static). Use StreamUtils instead.
37+
### Enhancements
38+
* Consistent use of try-with-resources when handling streams
39+
* Replaced org.apache.tika:tika library with org.overviewproject:mime-types in FileUtil to validate uploaded file mime types.
40+
* Updated the following dependencies:
41+
* wcomponents-core:
42+
* com.google.code.gson:gson from 2.13.1 to 2.13.2
43+
* org.apache.commons:commons-lang3 from 3.18.0 to 3.20.0
44+
* commons-io:commons-io from 2.19.0 to 2.21.0
45+
* com.google.errorprone:error_prone_annotations from 2.39.0 to 2.46.0
46+
* org.apache.httpcomponents.client5:httpclient5 from 5.5 to 5.6
47+
* org.apache.httpcomponents.core5:httpcore5 from 5.3.4 to 5.4
48+
* wcomponents-test-lib:
49+
* io.github.bonigarcia:webdrivermanager from 6.1.0 to 6.3.3
50+
* org.apache.commons:commons-compress from 1.27.1 to 1.28.0
51+
* commons-codec:commons-codec from 1.18.0 to 1.20.0
52+
* com.google.guava:guava from 33.4.8-jre to 33.5.0-jre
53+
* net.java.dev.jna:jna from 5.17.0 to 5.18.1
54+
* wcomponents-bundle:
55+
* org.ehcache:ehcahce from 3.10.8 to 3.11.1
56+
* org.glassfish.jaxb:jaxb-runtime from 4.0.5 to 4.0.6
57+
### Bug Fixes
58+
* Updated FileUtil to make file extension and mime type validation case insensitive.
59+
60+
## 1.5.38
61+
62+
### Enhancements
63+
* To improve the robustness of the session token parameter (wc_t), which is used to prevent CSRF attacks, the following changes have been made:
64+
* The session token is no longer included on any GET URLs and only posted in the body for POSTS.
65+
* Modified the session token interceptors to only accept a session token on a POST and throw an exception if provided on a GET.
66+
* Modified Targetable components to use the new createTargetUrl method in WebUtilites that centralises the logic for
67+
creating the URLs for Targetable components and excludes the session token.
68+
* Moved the adding of the hidden parameters onto the AJAX url from the XSL into the WApplicationRenderer so the session
69+
token can be excluded.
70+
* Updated beanutils version and package names as beanutils had a transient dependency on commons-collections that has security vulnerabilies.
71+
* commons-beanutils:commons-beanutils:1.11.0 to org.apache.commons:commons-beanutils2:2.0.0-M2
72+
* Updated antisamy to latest version 1.7.8 as it has reinstated the xHTML behaviour for tags. Versions 1.7.0 to 1.7.6 did not support xHTML and would break the XML.
73+
* org.owasp.antisamy:antismay from 1.6.8 to 1.7.8
74+
* Updated FileUtil to include MetaData hints when calling tika to help tika identify a files content type.
75+
76+
NOTE - The session token changes are not backwards compatable with older themes.
77+
3378
## 1.5.37
3479

3580
### Enhancements

‎code-coverage/pom.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>com.github.bordertech.wcomponents</groupId>
7+
<artifactId>wcomponents-parent</artifactId>
8+
<version>1.5.40-SNAPSHOT</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
12+
<name>code-coverage</name>
13+
<artifactId>code-coverage</artifactId>
14+
15+
<packaging>jar</packaging>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.github.bordertech.wcomponents</groupId>
20+
<artifactId>wcomponents-core</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>com.github.bordertech.wcomponents</groupId>
25+
<artifactId>wcomponents-examples</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.github.bordertech.wcomponents</groupId>
30+
<artifactId>wcomponents-test-lib</artifactId>
31+
<version>${project.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.github.bordertech.wcomponents</groupId>
35+
<artifactId>wcomponents-lde</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
</dependencies>
39+
40+
<build>
41+
42+
<plugins>
43+
<!-- Generate aggreated coverage report -->
44+
<plugin>
45+
<groupId>org.jacoco</groupId>
46+
<artifactId>jacoco-maven-plugin</artifactId>
47+
<executions>
48+
<execution>
49+
<id>report-aggregate</id>
50+
<phase>test</phase>
51+
<goals>
52+
<goal>report-aggregate</goal>
53+
</goals>
54+
</execution>
55+
</executions>
56+
</plugin>
57+
<!-- This coverage module should never de deployed -->
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-deploy-plugin</artifactId>
61+
<version>3.1.4</version>
62+
<configuration>
63+
<skip>true</skip>
64+
</configuration>
65+
</plugin>
66+
</plugins>
67+
68+
</build>
69+
70+
</project>

‎pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>com.github.bordertech.wcomponents</groupId>
1515
<artifactId>wcomponents-parent</artifactId>
16-
<version>1.5.38-SNAPSHOT</version>
16+
<version>1.5.40-SNAPSHOT</version>
1717

1818
<packaging>pom</packaging>
1919

@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>org.ehcache</groupId>
8787
<artifactId>ehcache</artifactId>
88-
<version>3.10.8</version>
88+
<version>3.11.1</version>
8989
<exclusions>
9090
<!-- Exclude jaxb runtime as ehcache has a wildcard dependency that breaks the build -->
9191
<exclusion>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>org.glassfish.jaxb</groupId>
109109
<artifactId>jaxb-runtime</artifactId>
110-
<version>4.0.5</version>
110+
<version>4.0.6</version>
111111
</dependency>
112112

113113
<!-- Servlet Interface -->
@@ -217,6 +217,7 @@
217217
<module>wcomponents-theme</module>
218218
<module>wcomponents-xslt</module>
219219
<module>wcomponents-bundle</module>
220+
<module>code-coverage</module>
220221
</modules>
221222

222223
</project>

‎wcomponents-bundle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.github.bordertech.wcomponents</groupId>
1010
<artifactId>wcomponents-parent</artifactId>
11-
<version>1.5.38-SNAPSHOT</version>
11+
<version>1.5.40-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎wcomponents-core/pom.xml‎

Lines changed: 25 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.github.bordertech.wcomponents</groupId>
1010
<artifactId>wcomponents-parent</artifactId>
11-
<version>1.5.38-SNAPSHOT</version>
11+
<version>1.5.40-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -101,15 +101,19 @@
101101
</dependency>
102102

103103
<dependency>
104-
<groupId>commons-beanutils</groupId>
105-
<artifactId>commons-beanutils</artifactId>
106-
<version>1.11.0</version>
104+
<groupId>org.apache.commons</groupId>
105+
<artifactId>commons-beanutils2</artifactId>
106+
<version>2.0.0-M2</version>
107107
<!-- Fix convergence -->
108108
<exclusions>
109109
<exclusion>
110110
<groupId>commons-logging</groupId>
111111
<artifactId>commons-logging</artifactId>
112112
</exclusion>
113+
<exclusion>
114+
<groupId>org.apache.commons</groupId>
115+
<artifactId>commons-lang3</artifactId>
116+
</exclusion>
113117
</exclusions>
114118
</dependency>
115119

@@ -186,7 +190,7 @@
186190
<dependency>
187191
<groupId>com.google.code.gson</groupId>
188192
<artifactId>gson</artifactId>
189-
<version>2.13.1</version>
193+
<version>2.13.2</version>
190194
<exclusions>
191195
<exclusion>
192196
<groupId>com.google.errorprone</groupId>
@@ -196,51 +200,36 @@
196200
</dependency>
197201

198202
<!-- Required for HTML input sanitization of WTextArea -->
199-
<!-- Antisamy as of 1.7.X does not support xhtml and will remove the closing tag on "void" elements which will break the XML-->
200-
<!-- Once WComponents stops using xslt then the latest Antisamy can be used -->
203+
<!-- Note - Antisamy versions 1.7.0 to 1.7.6 does not support xhtml and will remove the closing tag on "void" elements which will break the XML-->
201204
<!-- https://html.spec.whatwg.org/multipage/syntax.html#void-elements -->
202205
<dependency>
203206
<groupId>org.owasp.antisamy</groupId>
204207
<artifactId>antisamy</artifactId>
205-
<version>1.6.8</version>
208+
<version>1.7.8</version>
206209
<!-- Fix convergence -->
207210
<exclusions>
208-
<exclusion>
209-
<groupId>org.slf4j</groupId>
210-
<artifactId>slf4j-api</artifactId>
211-
</exclusion>
212211
<exclusion>
213212
<groupId>org.apache.xmlgraphics</groupId>
214213
<artifactId>batik-css</artifactId>
215214
</exclusion>
216-
<exclusion>
217-
<groupId>commons-io</groupId>
218-
<artifactId>commons-io</artifactId>
219-
</exclusion>
220215
<exclusion>
221216
<groupId>org.apache.httpcomponents.client5</groupId>
222217
<artifactId>httpclient5</artifactId>
223218
</exclusion>
224219
<exclusion>
225-
<groupId>org.apache.httpcomponents.core5</groupId>
226-
<artifactId>httpcore5</artifactId>
220+
<groupId>xerces</groupId>
221+
<artifactId>xercesImpl</artifactId>
227222
</exclusion>
228223
<exclusion>
229-
<groupId>net.sourceforge.htmlunit</groupId>
230-
<artifactId>neko-htmlunit</artifactId>
224+
<groupId>commons-io</groupId>
225+
<artifactId>commons-io</artifactId>
231226
</exclusion>
232227
<exclusion>
233-
<groupId>xerces</groupId>
234-
<artifactId>xercesImpl</artifactId>
228+
<groupId>org.apache.httpcomponents.core5</groupId>
229+
<artifactId>httpcore5</artifactId>
235230
</exclusion>
236231
</exclusions>
237232
</dependency>
238-
<!-- Neko-htmlunit had a package rename as of 3.X.X and cannot be picked up until latest Antisamy can be used -->
239-
<dependency>
240-
<groupId>net.sourceforge.htmlunit</groupId>
241-
<artifactId>neko-htmlunit</artifactId>
242-
<version>2.70.0</version>
243-
</dependency>
244233
<dependency>
245234
<groupId>org.apache.xmlgraphics</groupId>
246235
<artifactId>batik-css</artifactId>
@@ -280,20 +269,9 @@
280269
</dependency>
281270

282271
<dependency>
283-
<groupId>org.apache.tika</groupId>
284-
<artifactId>tika-core</artifactId>
285-
<version>2.9.4</version>
286-
<!-- Fix convergence -->
287-
<exclusions>
288-
<exclusion>
289-
<groupId>org.slf4j</groupId>
290-
<artifactId>slf4j-api</artifactId>
291-
</exclusion>
292-
<exclusion>
293-
<groupId>commons-io</groupId>
294-
<artifactId>commons-io</artifactId>
295-
</exclusion>
296-
</exclusions>
272+
<groupId>org.overviewproject</groupId>
273+
<artifactId>mime-types</artifactId>
274+
<version>2.0.0</version>
297275
</dependency>
298276

299277
<!-- Force versions to fix convergence -->
@@ -310,22 +288,22 @@
310288
<dependency>
311289
<groupId>org.apache.commons</groupId>
312290
<artifactId>commons-lang3</artifactId>
313-
<version>3.18.0</version>
291+
<version>3.20.0</version>
314292
</dependency>
315293
<dependency>
316294
<groupId>commons-io</groupId>
317295
<artifactId>commons-io</artifactId>
318-
<version>2.19.0</version>
296+
<version>2.21.0</version>
319297
</dependency>
320298
<dependency>
321299
<groupId>com.google.errorprone</groupId>
322300
<artifactId>error_prone_annotations</artifactId>
323-
<version>2.39.0</version>
301+
<version>2.46.0</version>
324302
</dependency>
325303
<dependency>
326304
<groupId>org.apache.httpcomponents.client5</groupId>
327305
<artifactId>httpclient5</artifactId>
328-
<version>5.5</version>
306+
<version>5.6</version>
329307
<exclusions>
330308
<exclusion>
331309
<groupId>org.slf4j</groupId>
@@ -336,7 +314,7 @@
336314
<dependency>
337315
<groupId>org.apache.httpcomponents.core5</groupId>
338316
<artifactId>httpcore5</artifactId>
339-
<version>5.3.4</version>
317+
<version>5.4</version>
340318
</dependency>
341319

342320
<!-- Test dependencies -->

‎wcomponents-core/src/main/java/com/github/bordertech/wcomponents/AbstractBeanBoundTableModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.bordertech.wcomponents;
22

33
import com.github.bordertech.wcomponents.WTable.BeanBoundTableModel;
4-
import org.apache.commons.beanutils.PropertyUtils;
4+
import org.apache.commons.beanutils2.PropertyUtils;
55
import org.apache.commons.logging.Log;
66
import org.apache.commons.logging.LogFactory;
77

‎wcomponents-core/src/main/java/com/github/bordertech/wcomponents/AbstractBeanTableDataModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.bordertech.wcomponents;
22

3-
import org.apache.commons.beanutils.PropertyUtils;
3+
import org.apache.commons.beanutils2.PropertyUtils;
44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
66

0 commit comments

Comments
 (0)