Skip to content

refactor: drop legacy rs/jquery + drop resource-server-content overlay #113

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

Open
bjagg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: drop legacy rs/jquery + drop resource-server-content overlay #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677110b
refactor(courses-portlet): drop legacy rs/jquery + retire <rs:compres…
bjagg May 6, 2026
9df8b28
chore(deps): drop resource-server-content overlay (lingering lodash +…
bjagg May 8, 2026
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
20 changes: 0 additions & 20 deletions courses-portlet-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-utils</artifactId>
</dependency>
<dependency>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-content</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.jasig.springframework</groupId>
<artifactId>spring-webmvc-portlet-contrib</artifactId>
Expand Down Expand Up @@ -228,21 +223,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<overlays>
<overlay>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-content</artifactId>
<includes>
<include>rs/jquery/1.6.1/</include>
<include>rs/jqueryui/1.8.13/</include>
</includes>
</overlay>
</overlays>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
Expand Down
1 change: 0 additions & 1 deletion courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/degreeprogress/whatIf.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<jsp:directive.include file="/WEB-INF/jsp/include.jsp"/>
<portlet:renderURL var="reportUrl"/>
<c:set var="n"><portlet:namespace/></c:set>
<script type="text/javascript" src="<rs:resourceURL value="/rs/jquery/1.4.2/jquery-1.4.2.min.js"/>"></script>

<link rel="stylesheet" type="text/css" href="<c:url value="/css/degree-progress.css"/>"></link>
<style type="text/css">
Expand Down
3 changes: 1 addition & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/final-grades/grades-jQM.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
htmlEscape="false"
javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>(function($) {
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
termEl: $('#${n}_termPicker'),
Expand All @@ -50,5 +50,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
3 changes: 1 addition & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/final-grades/grades.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
htmlEscape="false"
javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>(function($) {
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
termEl: $('#${n}_termPicker'),
Expand All @@ -54,5 +54,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
2 changes: 0 additions & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/mycourses/grades-jQM.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<portlet:resourceURL var="gradesCourseListUrl" id="gradesUpdate" />
<spring:message var="errorMessage" code="grades.unavailable" htmlEscape="false" javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
Expand All @@ -91,5 +90,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
3 changes: 1 addition & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/mycourses/grades.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<spring:message var="errorMessage" code="grades.unavailable"
htmlEscape="false" javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>(function($) {
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
termSelector : '#${n}_termPicker',
Expand All @@ -97,5 +97,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
2 changes: 0 additions & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/myuwcourses/grades-jQM.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<portlet:resourceURL var="gradesCourseListUrl" id="gradesUpdate" />
<spring:message code="grades.unavailable" arguments="${portletSessionScope.helpDeskURL}" htmlEscape="false" javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
Expand All @@ -91,5 +90,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
3 changes: 1 addition & 2 deletions courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/myuwcourses/grades.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<portlet:resourceURL var="gradesCourseListUrl" id="gradesUpdate" />
<spring:message code="grades.unavailable" arguments="${portletSessionScope.helpDeskURL}" htmlEscape="false" javaScriptEscape="false" />
<script type="text/javascript" language="javascript">
<rs:compressJs>(function($) {
(function($) {
$(function() {
coursesPortlet.updateGradesTermHandler({
termSelector : '#${n}_termPicker',
Expand All @@ -96,5 +96,4 @@
});
});
})(coursesPortlet.jQuery);
</rs:compressJs>
</script>
11 changes: 5 additions & 6 deletions courses-portlet-webapp/src/main/webapp/resources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@

<css>css/uwCoursesPortlet.css</css>
<css>css/jquery.timetable.css</css>

<js included="plain" resource="true">/rs/jquery/1.9.1/jquery-1.9.1.js</js>
<js included="aggregated" resource="true">/rs/jquery/1.9.1/jquery-1.9.1.min.js</js>

<js included="plain" resource="true">/rs/jqueryui/1.8.13/jquery-ui-1.8.13.js</js>
<js included="aggregated" resource="true">/rs/jqueryui/1.8.13/jquery-ui-1.8.13.min.js</js>

<!-- jQuery + jQuery UI come from the bedrock skin (jquery 4.x + migrate,
jquery-ui 1.14.x). CoursesPortlet's own jquery 1.9.1 / jquery-ui
1.8.13 overrides removed 2026-05-06 to close known XSS CVEs in
1.x. -->

<!-- Order is important here, the log script needs to be the first thing followed by the debug toggle -->
<js>js-lib/jquery.log.js</js>
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-content</artifactId>
<version>${resource-server.version}</version>
<type>war</type>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading