Skip to content

Commit

Permalink
SAK-41010 Remove jstl library from lib and move to tool scope
Browse files Browse the repository at this point in the history
  • Loading branch information
ramon authored and Miguel Pellicer committed Feb 28, 2019
1 parent 777cb59 commit 1e71798
Show file tree
Hide file tree
Showing 18 changed files with 5 additions and 29 deletions.
1 change: 0 additions & 1 deletion admin-su/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
2 changes: 0 additions & 2 deletions chat/chat-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${sakai.jstl.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
Expand Down
1 change: 0 additions & 1 deletion commons/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
6 changes: 0 additions & 6 deletions deploy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@
<scope>compile</scope>
</dependency>

<!-- incorporated jstl-shared-deploy pom. Can be dropped once it's confirmed that JSF-related tools are bundling it up in their webapps. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>

<!-- quartz scheduler -->
<dependency>
Expand Down
1 change: 0 additions & 1 deletion feedback/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
1 change: 0 additions & 1 deletion help/help-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Expand Down
1 change: 0 additions & 1 deletion jobscheduler/scheduler-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.jsf</groupId>
Expand Down
1 change: 0 additions & 1 deletion master/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,6 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${sakai.jstl.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
Expand Down
1 change: 0 additions & 1 deletion msgcntr/messageforums-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${sakai.jstl.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion podcasts/podcasts-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
</dependencies>
<!-- needed so it will compile the java files,
process the properties bundles,
Expand Down
1 change: 1 addition & 0 deletions roster2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@
</dependency>
</dependencies>


</project>
1 change: 0 additions & 1 deletion roster2/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
1 change: 0 additions & 1 deletion rwiki/rwiki-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
7 changes: 0 additions & 7 deletions samigo/samigo-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -265,8 +260,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${sakai.jstl.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
Expand Down
1 change: 0 additions & 1 deletion signup/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
1 change: 0 additions & 1 deletion signup/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
1 change: 0 additions & 1 deletion simple-rss-portlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Expand Down
1 change: 0 additions & 1 deletion user/user-tool-prefs/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Expand Down

0 comments on commit 1e71798

Please sign in to comment.