Skip to content

Commit 8d24e98

Browse files
flaixflaix
authored
Merge pull request #1461 from flaix/depupd
Update dependencies
2 parents 251d99e + b1f7c7c commit 8d24e98

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎.classpath

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
<classpathentry kind="lib" path="ext/guice-5.1.0.jar" sourcepath="ext/src/guice-5.1.0.jar" />
1010
<classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
1111
<classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
12-
<classpathentry kind="lib" path="ext/guava-31.1-jre.jar" sourcepath="ext/src/guava-31.1-jre.jar" />
12+
<classpathentry kind="lib" path="ext/guava-32.1.3-jre.jar" sourcepath="ext/src/guava-32.1.3-jre.jar" />
1313
<classpathentry kind="lib" path="ext/failureaccess-1.0.1.jar" sourcepath="ext/src/failureaccess-1.0.1.jar" />
1414
<classpathentry kind="lib" path="ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
1515
<classpathentry kind="lib" path="ext/jsr305-3.0.2.jar" sourcepath="ext/src/jsr305-3.0.2.jar" />
16-
<classpathentry kind="lib" path="ext/checker-qual-3.12.0.jar" sourcepath="ext/src/checker-qual-3.12.0.jar" />
17-
<classpathentry kind="lib" path="ext/error_prone_annotations-2.11.0.jar" sourcepath="ext/src/error_prone_annotations-2.11.0.jar" />
18-
<classpathentry kind="lib" path="ext/j2objc-annotations-1.3.jar" sourcepath="ext/src/j2objc-annotations-1.3.jar" />
16+
<classpathentry kind="lib" path="ext/checker-qual-3.37.0.jar" sourcepath="ext/src/checker-qual-3.37.0.jar" />
17+
<classpathentry kind="lib" path="ext/error_prone_annotations-2.21.1.jar" sourcepath="ext/src/error_prone_annotations-2.21.1.jar" />
18+
<classpathentry kind="lib" path="ext/j2objc-annotations-2.8.jar" sourcepath="ext/src/j2objc-annotations-2.8.jar" />
1919
<classpathentry kind="lib" path="ext/guice-servlet-5.1.0-gb2.jar" sourcepath="ext/src/guice-servlet-5.1.0-gb2.jar" />
2020
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
21-
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
22-
<classpathentry kind="lib" path="ext/slf4j-api-1.7.29.jar" sourcepath="ext/src/slf4j-api-1.7.29.jar" />
23-
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.29.jar" sourcepath="ext/src/slf4j-log4j12-1.7.29.jar" />
21+
<classpathentry kind="lib" path="ext/reload4j-1.2.25.jar" sourcepath="ext/src/reload4j-1.2.25.jar" />
22+
<classpathentry kind="lib" path="ext/slf4j-api-1.7.36.jar" sourcepath="ext/src/slf4j-api-1.7.36.jar" />
23+
<classpathentry kind="lib" path="ext/slf4j-reload4j-1.7.36.jar" sourcepath="ext/src/slf4j-reload4j-1.7.36.jar" />
2424
<classpathentry kind="lib" path="ext/javax.mail-1.5.6.jar" sourcepath="ext/src/javax.mail-1.5.6.jar" />
2525
<classpathentry kind="lib" path="ext/activation-1.1.jar" sourcepath="ext/src/activation-1.1.jar" />
2626
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
@@ -72,15 +72,15 @@
7272
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.69.jar" sourcepath="ext/src/bcpkix-jdk15on-1.69.jar" />
7373
<classpathentry kind="lib" path="ext/eddsa-0.2.0.jar" sourcepath="ext/src/eddsa-0.2.0.jar" />
7474
<classpathentry kind="lib" path="ext/sshd-core-1.7.0.jar" sourcepath="ext/src/sshd-core-1.7.0.jar" />
75-
<classpathentry kind="lib" path="ext/mina-core-2.0.21.jar" sourcepath="ext/src/mina-core-2.0.21.jar" />
75+
<classpathentry kind="lib" path="ext/mina-core-2.0.25.jar" sourcepath="ext/src/mina-core-2.0.25.jar" />
7676
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
7777
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
7878
<classpathentry kind="lib" path="ext/gson-2.10.jar" sourcepath="ext/src/gson-2.10.jar" />
7979
<classpathentry kind="lib" path="ext/groovy-all-2.4.4.jar" sourcepath="ext/src/groovy-all-2.4.4.jar" />
8080
<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar" />
8181
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
8282
<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
83-
<classpathentry kind="lib" path="ext/commons-compress-1.22.jar" sourcepath="ext/src/commons-compress-1.22.jar" />
83+
<classpathentry kind="lib" path="ext/commons-compress-1.24.0.jar" sourcepath="ext/src/commons-compress-1.24.0.jar" />
8484
<classpathentry kind="lib" path="ext/commons-io-2.11.0.jar" sourcepath="ext/src/commons-io-2.11.0.jar" />
8585
<classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
8686
<classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />
@@ -94,8 +94,8 @@
9494
<classpathentry kind="lib" path="ext/jedis-2.6.2.jar" sourcepath="ext/src/jedis-2.6.2.jar" />
9595
<classpathentry kind="lib" path="ext/commons-pool2-2.0.jar" sourcepath="ext/src/commons-pool2-2.0.jar" />
9696
<classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar" />
97-
<classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar" />
98-
<classpathentry kind="lib" path="ext/jsoup-1.7.3.jar" sourcepath="ext/src/jsoup-1.7.3.jar" />
97+
<classpathentry kind="lib" path="ext/tika-core-1.28.5.jar" sourcepath="ext/src/tika-core-1.28.5.jar" />
98+
<classpathentry kind="lib" path="ext/jsoup-1.16.2.jar" sourcepath="ext/src/jsoup-1.16.2.jar" />
9999
<classpathentry kind="lib" path="ext/javax.activation-1.2.0.jar" sourcepath="ext/src/javax.activation-1.2.0.jar" />
100100
<classpathentry kind="lib" path="ext/junit-4.12.jar" sourcepath="ext/src/junit-4.12.jar" />
101101
<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />

‎build.moxie

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit
106106
# Convenience properties for dependencies
107107
properties: {
108108
jetty.version : 9.4.49.v20220914
109-
slf4j.version : 1.7.29
109+
slf4j.version : 1.7.36
110110
wicket.version : 1.4.22
111111
lucene.version : 5.5.2
112112
jgit.version : 4.11.9.201909030838-r
@@ -115,7 +115,7 @@ properties: {
115115
selenium.version : 2.28.0
116116
wikitext.version : 1.4
117117
sshd.version: 1.7.0
118-
mina.version: 2.0.21
118+
mina.version: 2.0.25
119119
guice.version : 5.1.0
120120
# Gitblit maintains a fork of guice-servlet
121121
guice-servlet.version : 5.1.0-gb2
@@ -135,11 +135,11 @@ properties: {
135135
dependencies:
136136
- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
137137
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
138-
- compile 'com.google.guava:guava:31.1-jre' :war :fedclient
138+
- compile 'com.google.guava:guava:32.1.3-jre' :war :fedclient
139139
- compile 'com.intellij:annotations:12.0' :war
140-
- compile 'log4j:log4j:1.2.17' :war :fedclient :manager
140+
- compile 'ch.qos.reload4j:reload4j:1.2.25' :war :fedclient :manager
141141
- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager
142-
- compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient :manager
142+
- compile 'org.slf4j:slf4j-reload4j:${slf4j.version}' :war :fedclient :manager
143143
- compile 'com.sun.mail:javax.mail:1.5.6' :war
144144
- compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
145145
- compile 'org.eclipse.jetty:jetty-servlet:${jetty.version}' @jar
@@ -180,7 +180,7 @@ dependencies:
180180
- compile 'com.unboundid:unboundid-ldapsdk:2.3.8' :war
181181
- compile 'org.apache.ivy:ivy:2.2.0' :war
182182
- compile 'com.toedter:jcalendar:1.3.2' :authority
183-
- compile 'org.apache.commons:commons-compress:1.22' :war
183+
- compile 'org.apache.commons:commons-compress:1.24.0' :war
184184
- compile 'commons-io:commons-io:2.11.0' :war
185185
- compile 'com.force.api:force-partner-api:24.0.0' :war
186186
- compile 'org.freemarker:freemarker:2.3.22' :war
@@ -190,8 +190,8 @@ dependencies:
190190
- compile 'commons-codec:commons-codec:1.9' :war
191191
- compile 'redis.clients:jedis:2.6.2' :war
192192
- compile 'ro.fortsoft.pf4j:pf4j:0.9.0' :war
193-
- compile 'org.apache.tika:tika-core:1.5' :war
194-
- compile 'org.jsoup:jsoup:1.7.3' :war
193+
- compile 'org.apache.tika:tika-core:1.28.5' :war
194+
- compile 'org.jsoup:jsoup:1.16.2' :war
195195
- compile 'com.sun.activation:javax.activation:1.2.0' :war :manager :fedclient
196196
- test 'junit:junit:4.12'
197197
# Dependencies for Selenium web page testing

‎gitblit.iml

+33-33
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
</library>
4949
</orderEntry>
5050
<orderEntry type="module-library">
51-
<library name="guava-31.1-jre.jar">
51+
<library name="guava-32.1.3-jre.jar">
5252
<CLASSES>
53-
<root url="jar://$MODULE_DIR$/ext/guava-31.1-jre.jar!/" />
53+
<root url="jar://$MODULE_DIR$/ext/guava-32.1.3-jre.jar!/" />
5454
</CLASSES>
5555
<JAVADOC />
5656
<SOURCES>
57-
<root url="jar://$MODULE_DIR$/ext/src/guava-31.1-jre.jar!/" />
57+
<root url="jar://$MODULE_DIR$/ext/src/guava-32.1.3-jre.jar!/" />
5858
</SOURCES>
5959
</library>
6060
</orderEntry>
@@ -90,35 +90,35 @@
9090
</library>
9191
</orderEntry>
9292
<orderEntry type="module-library">
93-
<library name="checker-qual-3.12.0.jar">
93+
<library name="checker-qual-3.37.0.jar">
9494
<CLASSES>
95-
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.12.0.jar!/" />
95+
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.37.0.jar!/" />
9696
</CLASSES>
9797
<JAVADOC />
9898
<SOURCES>
99-
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.12.0.jar!/" />
99+
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.37.0.jar!/" />
100100
</SOURCES>
101101
</library>
102102
</orderEntry>
103103
<orderEntry type="module-library">
104-
<library name="error_prone_annotations-2.11.0.jar">
104+
<library name="error_prone_annotations-2.21.1.jar">
105105
<CLASSES>
106-
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.11.0.jar!/" />
106+
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.21.1.jar!/" />
107107
</CLASSES>
108108
<JAVADOC />
109109
<SOURCES>
110-
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.11.0.jar!/" />
110+
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.21.1.jar!/" />
111111
</SOURCES>
112112
</library>
113113
</orderEntry>
114114
<orderEntry type="module-library">
115-
<library name="j2objc-annotations-1.3.jar">
115+
<library name="j2objc-annotations-2.8.jar">
116116
<CLASSES>
117-
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-1.3.jar!/" />
117+
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-2.8.jar!/" />
118118
</CLASSES>
119119
<JAVADOC />
120120
<SOURCES>
121-
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-1.3.jar!/" />
121+
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-2.8.jar!/" />
122122
</SOURCES>
123123
</library>
124124
</orderEntry>
@@ -145,35 +145,35 @@
145145
</library>
146146
</orderEntry>
147147
<orderEntry type="module-library">
148-
<library name="log4j-1.2.17.jar">
148+
<library name="reload4j-1.2.25.jar">
149149
<CLASSES>
150-
<root url="jar://$MODULE_DIR$/ext/log4j-1.2.17.jar!/" />
150+
<root url="jar://$MODULE_DIR$/ext/reload4j-1.2.25.jar!/" />
151151
</CLASSES>
152152
<JAVADOC />
153153
<SOURCES>
154-
<root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17.jar!/" />
154+
<root url="jar://$MODULE_DIR$/ext/src/reload4j-1.2.25.jar!/" />
155155
</SOURCES>
156156
</library>
157157
</orderEntry>
158158
<orderEntry type="module-library">
159-
<library name="slf4j-api-1.7.29.jar">
159+
<library name="slf4j-api-1.7.36.jar">
160160
<CLASSES>
161-
<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.29.jar!/" />
161+
<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.36.jar!/" />
162162
</CLASSES>
163163
<JAVADOC />
164164
<SOURCES>
165-
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.29.jar!/" />
165+
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.36.jar!/" />
166166
</SOURCES>
167167
</library>
168168
</orderEntry>
169169
<orderEntry type="module-library">
170-
<library name="slf4j-log4j12-1.7.29.jar">
170+
<library name="slf4j-reload4j-1.7.36.jar">
171171
<CLASSES>
172-
<root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.29.jar!/" />
172+
<root url="jar://$MODULE_DIR$/ext/slf4j-reload4j-1.7.36.jar!/" />
173173
</CLASSES>
174174
<JAVADOC />
175175
<SOURCES>
176-
<root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.29.jar!/" />
176+
<root url="jar://$MODULE_DIR$/ext/src/slf4j-reload4j-1.7.36.jar!/" />
177177
</SOURCES>
178178
</library>
179179
</orderEntry>
@@ -737,13 +737,13 @@
737737
</library>
738738
</orderEntry>
739739
<orderEntry type="module-library">
740-
<library name="mina-core-2.0.21.jar">
740+
<library name="mina-core-2.0.25.jar">
741741
<CLASSES>
742-
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.21.jar!/" />
742+
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.25.jar!/" />
743743
</CLASSES>
744744
<JAVADOC />
745745
<SOURCES>
746-
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.21.jar!/" />
746+
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.25.jar!/" />
747747
</SOURCES>
748748
</library>
749749
</orderEntry>
@@ -823,13 +823,13 @@
823823
</library>
824824
</orderEntry>
825825
<orderEntry type="module-library">
826-
<library name="commons-compress-1.22.jar">
826+
<library name="commons-compress-1.24.0.jar">
827827
<CLASSES>
828-
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.22.jar!/" />
828+
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.24.0.jar!/" />
829829
</CLASSES>
830830
<JAVADOC />
831831
<SOURCES>
832-
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.22.jar!/" />
832+
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.24.0.jar!/" />
833833
</SOURCES>
834834
</library>
835835
</orderEntry>
@@ -977,24 +977,24 @@
977977
</library>
978978
</orderEntry>
979979
<orderEntry type="module-library">
980-
<library name="tika-core-1.5.jar">
980+
<library name="tika-core-1.28.5.jar">
981981
<CLASSES>
982-
<root url="jar://$MODULE_DIR$/ext/tika-core-1.5.jar!/" />
982+
<root url="jar://$MODULE_DIR$/ext/tika-core-1.28.5.jar!/" />
983983
</CLASSES>
984984
<JAVADOC />
985985
<SOURCES>
986-
<root url="jar://$MODULE_DIR$/ext/src/tika-core-1.5.jar!/" />
986+
<root url="jar://$MODULE_DIR$/ext/src/tika-core-1.28.5.jar!/" />
987987
</SOURCES>
988988
</library>
989989
</orderEntry>
990990
<orderEntry type="module-library">
991-
<library name="jsoup-1.7.3.jar">
991+
<library name="jsoup-1.16.2.jar">
992992
<CLASSES>
993-
<root url="jar://$MODULE_DIR$/ext/jsoup-1.7.3.jar!/" />
993+
<root url="jar://$MODULE_DIR$/ext/jsoup-1.16.2.jar!/" />
994994
</CLASSES>
995995
<JAVADOC />
996996
<SOURCES>
997-
<root url="jar://$MODULE_DIR$/ext/src/jsoup-1.7.3.jar!/" />
997+
<root url="jar://$MODULE_DIR$/ext/src/jsoup-1.16.2.jar!/" />
998998
</SOURCES>
999999
</library>
10001000
</orderEntry>

‎src/main/java/com/gitblit/utils/JSoupXssFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.jsoup.Jsoup;
1919
import org.jsoup.nodes.Document;
2020
import org.jsoup.safety.Cleaner;
21-
import org.jsoup.safety.Whitelist;
21+
import org.jsoup.safety.Safelist;
2222

2323
import com.google.inject.Inject;
2424
import com.google.inject.Singleton;
@@ -38,7 +38,7 @@ public class JSoupXssFilter implements XssFilter {
3838

3939
@Inject
4040
public JSoupXssFilter() {
41-
none = new Cleaner(Whitelist.none());
41+
none = new Cleaner(Safelist.none());
4242
relaxed = new Cleaner(getRelaxedWhiteList());
4343
}
4444

@@ -64,8 +64,8 @@ protected String clean(String input, Cleaner cleaner) {
6464
* https://github.com/github/markup/tree/master#html-sanitization
6565
* @return a loose HTML whitelist
6666
*/
67-
protected Whitelist getRelaxedWhiteList() {
68-
return new Whitelist()
67+
protected Safelist getRelaxedWhiteList() {
68+
return new Safelist()
6969
.addTags(
7070
"a", "b", "blockquote", "br", "caption", "cite", "code", "col",
7171
"colgroup", "dd", "del", "div", "dl", "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "hr",

0 commit comments

Comments
 (0)