Skip to content

Commit 1e71798

Browse files
ramonMiguel Pellicer
ramon
authored and
Miguel Pellicer
committed
SAK-41010 Remove jstl library from lib and move to tool scope
1 parent 777cb59 commit 1e71798

File tree

18 files changed

+5
-29
lines changed

18 files changed

+5
-29
lines changed

‎admin-su/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>jstl</artifactId>
48-
<scope>compile</scope>
4948
</dependency>
5049
<dependency>
5150
<groupId>taglibs</groupId>

‎chat/chat-tool/tool/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@
9999
<dependency>
100100
<groupId>javax.servlet</groupId>
101101
<artifactId>jstl</artifactId>
102-
<version>${sakai.jstl.version}</version>
103-
<scope>compile</scope>
104102
</dependency>
105103
<dependency>
106104
<groupId>org.jboss.weld.servlet</groupId>

‎commons/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<dependency>
7272
<groupId>javax.servlet</groupId>
7373
<artifactId>jstl</artifactId>
74-
<scope>compile</scope>
7574
</dependency>
7675
<dependency>
7776
<groupId>taglibs</groupId>

‎deploy/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@
128128
<scope>compile</scope>
129129
</dependency>
130130

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

138132
<!-- quartz scheduler -->
139133
<dependency>

‎feedback/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>jstl</artifactId>
48-
<scope>compile</scope>
4948
</dependency>
5049
<dependency>
5150
<groupId>taglibs</groupId>

‎help/help-tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<dependency>
4242
<groupId>javax.servlet</groupId>
4343
<artifactId>jstl</artifactId>
44-
<scope>compile</scope>
4544
</dependency>
4645
<dependency>
4746
<groupId>javax.servlet.jsp</groupId>

‎jobscheduler/scheduler-tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
5656
<artifactId>jstl</artifactId>
57-
<scope>compile</scope>
5857
</dependency>
5958
<dependency>
6059
<groupId>org.sakaiproject.jsf</groupId>

‎master/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,6 @@
871871
<groupId>javax.servlet</groupId>
872872
<artifactId>jstl</artifactId>
873873
<version>${sakai.jstl.version}</version>
874-
<scope>provided</scope>
875874
</dependency>
876875
<dependency>
877876
<groupId>javax.transaction</groupId>

‎msgcntr/messageforums-app/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
5252
<artifactId>jstl</artifactId>
53-
<version>${sakai.jstl.version}</version>
5453
<scope>runtime</scope>
5554
</dependency>
5655
<dependency>

‎podcasts/podcasts-app/pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@
7474
<groupId>commons-lang</groupId>
7575
<artifactId>commons-lang</artifactId>
7676
</dependency>
77-
77+
<dependency>
78+
<groupId>javax.servlet</groupId>
79+
<artifactId>jstl</artifactId>
80+
</dependency>
7881
</dependencies>
7982
<!-- needed so it will compile the java files,
8083
process the properties bundles,

‎roster2/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
</dependency>
3636
</dependencies>
3737

38+
3839
</project>

‎roster2/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<dependency>
121121
<groupId>javax.servlet</groupId>
122122
<artifactId>jstl</artifactId>
123-
<scope>compile</scope>
124123
</dependency>
125124
<dependency>
126125
<groupId>taglibs</groupId>

‎rwiki/rwiki-tool/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<dependency>
112112
<groupId>javax.servlet</groupId>
113113
<artifactId>jstl</artifactId>
114-
<scope>compile</scope>
115114
</dependency>
116115
<dependency>
117116
<groupId>taglibs</groupId>

‎samigo/samigo-app/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@
156156
</dependency>
157157
<dependency>
158158
<groupId>javax.servlet</groupId>
159-
<artifactId>jstl</artifactId>
160-
<scope>compile</scope>
161-
</dependency>
162-
<dependency>
163-
<groupId>javax.servlet</groupId>
164159
<artifactId>javax.servlet-api</artifactId>
165160
</dependency>
166161
<dependency>
@@ -265,8 +260,6 @@
265260
<dependency>
266261
<groupId>javax.servlet</groupId>
267262
<artifactId>jstl</artifactId>
268-
<version>${sakai.jstl.version}</version>
269-
<scope>compile</scope>
270263
</dependency>
271264
<dependency>
272265
<groupId>org.jboss.weld.servlet</groupId>

‎signup/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
<groupId>javax.servlet</groupId>
132132
<artifactId>jstl</artifactId>
133133
<version>1.1.2</version>
134-
<scope>compile</scope>
135134
</dependency>
136135
<dependency>
137136
<groupId>taglibs</groupId>

‎signup/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
<dependency>
119119
<groupId>javax.servlet</groupId>
120120
<artifactId>jstl</artifactId>
121-
<scope>provided</scope>
122121
</dependency>
123122
<dependency>
124123
<groupId>taglibs</groupId>

‎simple-rss-portlet/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<dependency>
4848
<groupId>javax.servlet</groupId>
4949
<artifactId>jstl</artifactId>
50-
<version>1.2</version>
5150
</dependency>
5251
<dependency>
5352
<groupId>taglibs</groupId>

‎user/user-tool-prefs/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<dependency>
8888
<groupId>javax.servlet</groupId>
8989
<artifactId>jstl</artifactId>
90-
<scope>compile</scope>
9190
</dependency>
9291
<dependency>
9392
<groupId>javax.servlet.jsp</groupId>

0 commit comments

Comments
 (0)