Skip to content

Commit 3218fd9

Browse files
ottenhoffottenhoff
authored
Update dependencies (#78)
1 parent e4ffe45 commit 3218fd9

File tree

9 files changed

+67
-31
lines changed

9 files changed

+67
-31
lines changed

‎.github/workflows/maven.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This workflow will build a Java project with Maven
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Java CI with Maven
5+
6+
on:
7+
pull_request:
8+
9+
jobs:
10+
maven-build:
11+
runs-on: ubuntu-22.04
12+
steps:
13+
- name: Git Checkout
14+
uses: actions/checkout@v4
15+
- name: JDK 11
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: 11
19+
distribution: 'temurin'
20+
- name: Build with Maven
21+
env:
22+
MAVEN_OPTS: -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true
23+
run: mvn clean install -Psnapshots -V -B

‎api/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>clog</artifactId>
88
<groupId>org.sakaiproject.clog</groupId>
9-
<version>23-SNAPSHOT</version>
9+
<version>25-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>CLOG API</name>
@@ -35,10 +35,6 @@
3535
<groupId>org.sakaiproject.search</groupId>
3636
<artifactId>search-api</artifactId>
3737
</dependency>
38-
<dependency>
39-
<groupId>commons-lang</groupId>
40-
<artifactId>commons-lang</artifactId>
41-
</dependency>
4238
<dependency>
4339
<groupId>org.projectlombok</groupId>
4440
<artifactId>lombok</artifactId>

‎api/src/java/org/sakaiproject/clog/api/datamodel/Comment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Date;
2121
import java.util.Stack;
2222

23-
import org.apache.commons.lang.StringEscapeUtils;
2423
import org.sakaiproject.clog.api.ClogManager;
2524
import org.sakaiproject.clog.api.cover.SakaiProxy;
2625
import org.sakaiproject.entity.api.Entity;
@@ -68,8 +67,7 @@ public void setContent(String text, boolean modified) {
6867
if (!this.content.equals(text) && modified) {
6968
modifiedDate = new Date().getTime();
7069
}
71-
72-
this.content = StringEscapeUtils.unescapeHtml(text.trim());
70+
this.content = text;
7371
}
7472

7573
public String getContent() {

‎help/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>clog</artifactId>
88
<groupId>org.sakaiproject.clog</groupId>
9-
<version>23-SNAPSHOT</version>
9+
<version>25-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>CLOG HELP</name>

‎impl/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>clog</artifactId>
88
<groupId>org.sakaiproject.clog</groupId>
9-
<version>23-SNAPSHOT</version>
9+
<version>25-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>CLOG IMPL</name>
@@ -51,10 +51,6 @@
5151
<groupId>org.springframework</groupId>
5252
<artifactId>spring-beans</artifactId>
5353
</dependency>
54-
<dependency>
55-
<groupId>commons-lang</groupId>
56-
<artifactId>commons-lang</artifactId>
57-
</dependency>
5854
<dependency>
5955
<groupId>junit</groupId>
6056
<artifactId>junit</artifactId>

‎pom.xml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
<parent>
77
<groupId>org.sakaiproject</groupId>
88
<artifactId>master</artifactId>
9-
<version>23-SNAPSHOT</version>
10-
<relativePath>../master/pom.xml</relativePath>
9+
<version>25-SNAPSHOT</version>
1110
</parent>
1211

1312
<name>CLOG</name>
1413
<groupId>org.sakaiproject.clog</groupId>
1514
<artifactId>clog</artifactId>
16-
<version>23-SNAPSHOT</version>
15+
<version>25-SNAPSHOT</version>
1716
<packaging>pom</packaging>
1817

1918
<modules>
@@ -44,5 +43,30 @@
4443
</dependency>
4544
</dependencies>
4645
</dependencyManagement>
46+
47+
<profiles>
48+
<profile>
49+
<id>snapshots</id>
50+
<activation>
51+
<activeByDefault>false</activeByDefault>
52+
<property>
53+
<name>snapshots</name>
54+
</property>
55+
</activation>
56+
<repositories>
57+
<repository>
58+
<id>sonatype-nexus-snapshots</id>
59+
<name>Sonatype Nexus Snapshots</name>
60+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
61+
<releases>
62+
<enabled>false</enabled>
63+
</releases>
64+
<snapshots>
65+
<enabled>true</enabled>
66+
</snapshots>
67+
</repository>
68+
</repositories>
69+
</profile>
70+
</profiles>
4771

4872
</project>

‎tool/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>clog</artifactId>
88
<groupId>org.sakaiproject.clog</groupId>
9-
<version>23-SNAPSHOT</version>
9+
<version>25-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>CLOG TOOL</name>
@@ -56,22 +56,23 @@
5656
<artifactId>javax.servlet-api</artifactId>
5757
</dependency>
5858
<dependency>
59-
<groupId>commons-lang</groupId>
60-
<artifactId>commons-lang</artifactId>
59+
<groupId>org.apache.commons</groupId>
60+
<artifactId>commons-lang3</artifactId>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.projectlombok</groupId>
6464
<artifactId>lombok</artifactId>
6565
</dependency>
6666
<dependency>
67-
<groupId>javax.servlet</groupId>
68-
<artifactId>jstl</artifactId>
67+
<groupId>jakarta.servlet.jsp.jstl</groupId>
68+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
69+
<version>${sakai.jakarta.jstl-api.version}</version>
6970
<scope>compile</scope>
7071
</dependency>
7172
<dependency>
72-
<groupId>taglibs</groupId>
73-
<artifactId>standard</artifactId>
74-
<version>1.1.2</version>
73+
<groupId>org.apache.taglibs</groupId>
74+
<artifactId>taglibs-standard-impl</artifactId>
75+
<version>1.2.5</version>
7576
<scope>compile</scope>
7677
</dependency>
7778
</dependencies>

‎tool/src/java/org/sakaiproject/clog/tool/ClogTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import javax.servlet.http.HttpServletRequest;
1010
import javax.servlet.http.HttpServletResponse;
1111

12-
import org.apache.commons.lang.StringEscapeUtils;
12+
import org.apache.commons.lang3.StringEscapeUtils;
1313
import org.sakaiproject.clog.api.ClogManager;
1414
import org.sakaiproject.clog.api.SakaiProxy;
1515
import org.sakaiproject.component.api.ComponentManager;
@@ -107,7 +107,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
107107
request.setAttribute("sakaiHtmlHead", (String) request.getAttribute("sakai.html.head"));
108108

109109
request.setAttribute("userId", userId);
110-
request.setAttribute("userDisplayName", StringEscapeUtils.escapeJavaScript(displayName));
110+
request.setAttribute("userDisplayName", StringEscapeUtils.escapeEcmaScript(displayName));
111111
request.setAttribute("siteId", siteId);
112112
request.setAttribute("state", state);
113113

‎tool/src/webapp/WEB-INF/functions.tld

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828

2929
<function>
3030
<name>escapeJS</name>
31-
<!--<function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>-->
32-
<!--<function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>-->
33-
<function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
34-
<function-signature>java.lang.String escapeJavaScript(java.lang.String)</function-signature>
31+
<function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>
32+
<function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>
3533
</function>
3634
</taglib>

0 commit comments

Comments
 (0)