diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 481c0b5c3..119f41dea 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation 'org.jdom:jdom2:2.0.6' //noinspection GradleDependency implementation "com.squareup.okhttp3:okhttp:$okhttp_version" - implementation 'org.jsoup:jsoup:1.13.1' + implementation 'org.jsoup:jsoup:1.15.3' annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java b/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java index bc20e8599..0a312c673 100644 --- a/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java +++ b/briar-core/src/main/java/org/briarproject/briar/util/HtmlUtils.java @@ -2,16 +2,16 @@ package org.briarproject.briar.util; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.jsoup.Jsoup; -import org.jsoup.safety.Whitelist; +import org.jsoup.safety.Safelist; @NotNullByDefault public class HtmlUtils { - public static Whitelist STRIP_ALL = Whitelist.none(); - public static Whitelist ARTICLE = - Whitelist.basic().addTags("h1", "h2", "h3", "h4", "h5", "h6"); + public static Safelist STRIP_ALL = Safelist.none(); + public static Safelist ARTICLE = Safelist.basic() + .addTags("h1", "h2", "h3", "h4", "h5", "h6"); - public static String clean(String s, Whitelist list) { + public static String clean(String s, Safelist list) { return Jsoup.clean(s, list); } diff --git a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java index a87018047..099ae1921 100644 --- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java @@ -131,7 +131,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase { SyndEntry entry = new SyndEntryImpl(); entry.setUpdatedDate(new Date()); entries.add(entry); - String text = "
(" + entry.getUpdatedDate().toString() + ")
"; + String text = "(" + entry.getUpdatedDate().toString() + ")
"; Message msg = getMessage(blogGroupId); BlogPost post = new BlogPost(msg, null, localAuthor); diff --git a/briar-core/witness.gradle b/briar-core/witness.gradle index 1302ee6c6..da2c3be0b 100644 --- a/briar-core/witness.gradle +++ b/briar-core/witness.gradle @@ -46,7 +46,7 @@ dependencyVerification { 'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd', 'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04', 'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be', - 'org.jsoup:jsoup:1.13.1:jsoup-1.13.1.jar:e2b99c0d2fa39f69f27efb1c0016390713feb2f2e02d8ea7f1c36b780271598a', + 'org.jsoup:jsoup:1.15.3:jsoup-1.15.3.jar:e20a5e78b1372f2a4e620832db4442d5077e5cbde280b24c666a3770844999bc', 'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984', 'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de', 'org.ow2.asm:asm:9.1:asm-9.1.jar:cda4de455fab48ff0bcb7c48b4639447d4de859a7afc30a094a986f0936beba2',