Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #78

Merged
merged 7 commits into from
Apr 11, 2024
Merged

Update dependencies #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bd9a76
Update dependencies
ottenhoff Apr 10, 2024
4b0ef6f
fix versions
ottenhoff Apr 10, 2024
5ee4dcd
distribution
ottenhoff Apr 10, 2024
41533e8
remove parent
ottenhoff Apr 10, 2024
6f6a656
25-SNAP
ottenhoff Apr 10, 2024
2c4c399
add snapshot repo
ottenhoff Apr 10, 2024
eb31ea3
Remove escaping from the API
ottenhoff Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
pull_request:

jobs:
maven-build:
runs-on: ubuntu-22.04
steps:
- name: Git Checkout
uses: actions/checkout@v4
- name: JDK 11
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
- name: Build with Maven
env:
MAVEN_OPTS: -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true
run: mvn clean install -Psnapshots -V -B
6 changes: 1 addition & 5 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>clog</artifactId>
<groupId>org.sakaiproject.clog</groupId>
<version>23-SNAPSHOT</version>
<version>25-SNAPSHOT</version>
</parent>

<name>CLOG API</name>
Expand Down Expand Up @@ -35,10 +35,6 @@
<groupId>org.sakaiproject.search</groupId>
<artifactId>search-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down
4 changes: 1 addition & 3 deletions api/src/java/org/sakaiproject/clog/api/datamodel/Comment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.Date;
import java.util.Stack;

import org.apache.commons.lang.StringEscapeUtils;
import org.sakaiproject.clog.api.ClogManager;
import org.sakaiproject.clog.api.cover.SakaiProxy;
import org.sakaiproject.entity.api.Entity;
Expand Down Expand Up @@ -68,8 +67,7 @@ public void setContent(String text, boolean modified) {
if (!this.content.equals(text) && modified) {
modifiedDate = new Date().getTime();
}

this.content = StringEscapeUtils.unescapeHtml(text.trim());
this.content = text;
}

public String getContent() {
Expand Down
2 changes: 1 addition & 1 deletion help/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>clog</artifactId>
<groupId>org.sakaiproject.clog</groupId>
<version>23-SNAPSHOT</version>
<version>25-SNAPSHOT</version>
</parent>

<name>CLOG HELP</name>
Expand Down
6 changes: 1 addition & 5 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>clog</artifactId>
<groupId>org.sakaiproject.clog</groupId>
<version>23-SNAPSHOT</version>
<version>25-SNAPSHOT</version>
</parent>

<name>CLOG IMPL</name>
Expand Down Expand Up @@ -51,10 +51,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
30 changes: 27 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>master</artifactId>
<version>23-SNAPSHOT</version>
<relativePath>../master/pom.xml</relativePath>
<version>25-SNAPSHOT</version>
</parent>

<name>CLOG</name>
<groupId>org.sakaiproject.clog</groupId>
<artifactId>clog</artifactId>
<version>23-SNAPSHOT</version>
<version>25-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down Expand Up @@ -44,5 +43,30 @@
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>snapshots</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>snapshots</name>
</property>
</activation>
<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>

</project>
17 changes: 9 additions & 8 deletions tool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>clog</artifactId>
<groupId>org.sakaiproject.clog</groupId>
<version>23-SNAPSHOT</version>
<version>25-SNAPSHOT</version>
</parent>

<name>CLOG TOOL</name>
Expand Down Expand Up @@ -56,22 +56,23 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${sakai.jakarta.jstl-api.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.5</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions tool/src/java/org/sakaiproject/clog/tool/ClogTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

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

request.setAttribute("userId", userId);
request.setAttribute("userDisplayName", StringEscapeUtils.escapeJavaScript(displayName));
request.setAttribute("userDisplayName", StringEscapeUtils.escapeEcmaScript(displayName));
request.setAttribute("siteId", siteId);
request.setAttribute("state", state);

Expand Down
6 changes: 2 additions & 4 deletions tool/src/webapp/WEB-INF/functions.tld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@

<function>
<name>escapeJS</name>
<!--<function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>-->
<!--<function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>-->
<function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
<function-signature>java.lang.String escapeJavaScript(java.lang.String)</function-signature>
<function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>
<function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>
</function>
</taglib>