Skip to content

Commit c27849c

Browse files
Raul Hidalgo Caballeroern
Raul Hidalgo Caballero
authored and
ern
committed
SAK-40004 - Javax dependencies updated (sakaiproject#5851)
* Javax.mail (sakaiproject#1) (sakaiproject#2) * Add javax.mail * changed to javax.mail * deleted com.sun.mail * moved to com.sun * Javax.portlet * Javax.jcr (sakaiproject#4) * moved to fixed version * javax.jcr is not required by anything, so deleting it * Javax.Activation (sakaiproject#7) * Add javax.activation-api * deploy * samigo-services * kernel-impl * samigo-app * import-util * import-impl * feedback * content-handlers * samigo-qti * deleted dependency * Javax.jsp-api (sakaiproject#6) * added javax.servlet.jsp-api * help-tool * postem-app * sitestats-tool * jsf-tool-sun * tool * podcasts-app * calendar * connector * tool * tool * myfaces-tool * tool * tool * ui * jsf-widgets-sun * jsf2-tool-sun * syllabus-app * business * myfaces-widgets * jsf2-widgets-sun * messageforums-app * jsf-widgets * admin-perms-tool * jsf2-widgets * sections-app-util * samigo-app * deleted jsp-api * Javax.servlet-api (sakaiproject#5) * added javax.servlet-api * admin-tools * del elfinder-sakai * del kernel-util * del cxf * jsf-tool * del tool * jsf2-tool * del impl * tool * Replaced all servelet-api for javax.servlet-api * removed duplicated * deleted duplicate * del duplicates * 4.0.1 cause some breaking changes * jus add a coment of future tasks * to v3.0.1 * Same for entitybroker rest * downgrade to the last working master version * render engine not upgraded for now
1 parent 19939c9 commit c27849c

File tree

161 files changed

+207
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+207
-237
lines changed

‎access/access-impl/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>javax.servlet</groupId>
29-
<artifactId>servlet-api</artifactId>
29+
<artifactId>javax.servlet-api</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.sakaiproject.kernel</groupId>

‎admin-tools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>javax.servlet</groupId>
22-
<artifactId>servlet-api</artifactId>
22+
<artifactId>javax.servlet-api</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.sakaiproject.kernel</groupId>

‎announcement/announcement-impl/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</dependency>
4242
<dependency>
4343
<groupId>javax.servlet</groupId>
44-
<artifactId>servlet-api</artifactId>
44+
<artifactId>javax.servlet-api</artifactId>
4545
</dependency>
4646
<dependency>
4747
<groupId>xerces</groupId>

‎announcement/announcement-tool/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</dependency>
7171
<dependency>
7272
<groupId>javax.servlet</groupId>
73-
<artifactId>servlet-api</artifactId>
73+
<artifactId>javax.servlet-api</artifactId>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.springframework</groupId>

‎assignment/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</dependency>
9595
<dependency>
9696
<groupId>javax.servlet</groupId>
97-
<artifactId>servlet-api</artifactId>
97+
<artifactId>javax.servlet-api</artifactId>
9898
</dependency>
9999
<dependency>
100100
<groupId>org.apache.poi</groupId>

‎assignment/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</dependency>
112112
<dependency>
113113
<groupId>javax.servlet</groupId>
114-
<artifactId>servlet-api</artifactId>
114+
<artifactId>javax.servlet-api</artifactId>
115115
</dependency>
116116
<dependency>
117117
<groupId>org.apache.httpcomponents</groupId>

‎basiclti/basiclti-blis/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</dependency>
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
56-
<artifactId>servlet-api</artifactId>
56+
<artifactId>javax.servlet-api</artifactId>
5757
</dependency>
5858
<dependency>
5959
<groupId>javax.portlet</groupId>

‎basiclti/basiclti-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</dependency>
7777
<dependency>
7878
<groupId>javax.servlet</groupId>
79-
<artifactId>servlet-api</artifactId>
79+
<artifactId>javax.servlet-api</artifactId>
8080
</dependency>
8181
<dependency>
8282
<groupId>commons-lang</groupId>

‎basiclti/basiclti-impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</dependency>
7171
<dependency>
7272
<groupId>javax.servlet</groupId>
73-
<artifactId>servlet-api</artifactId>
73+
<artifactId>javax.servlet-api</artifactId>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.hsqldb</groupId>

‎basiclti/basiclti-portlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</dependency>
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
52-
<artifactId>servlet-api</artifactId>
52+
<artifactId>javax.servlet-api</artifactId>
5353
</dependency>
5454
<dependency>
5555
<groupId>javax.portlet</groupId>

‎basiclti/basiclti-tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</dependency>
3838
<dependency>
3939
<groupId>javax.servlet</groupId>
40-
<artifactId>servlet-api</artifactId>
40+
<artifactId>javax.servlet-api</artifactId>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.sakaiproject.kernel</groupId>

‎basiclti/portlet-util/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
<dependencies>
2222
<dependency>
2323
<groupId>javax.servlet</groupId>
24-
<artifactId>servlet-api</artifactId>
24+
<artifactId>javax.servlet-api</artifactId>
2525
<scope>provided</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>javax.portlet</groupId>
2929
<artifactId>portlet-api</artifactId>
30-
<version>1.0</version>
3130
<scope>provided</scope>
3231
</dependency>
3332
<dependency>

‎basiclti/tsugi-util/pom-tsugi.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
<dependencies>
2121
<dependency>
2222
<groupId>javax.servlet</groupId>
23-
<artifactId>servlet-api</artifactId>
24-
<version>2.4</version>
23+
<artifactId>javax.servlet-api</artifactId>
2524
</dependency>
2625

2726
<dependency>

‎basiclti/tsugi-util/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Sakai-specific code needs to be placed in the basiclti-common folder -->
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
26-
<artifactId>servlet-api</artifactId>
26+
<artifactId>javax.servlet-api</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-lang</groupId>

‎basiclti/web-ifp/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@
4242
</dependency>
4343
<dependency>
4444
<groupId>javax.servlet</groupId>
45-
<artifactId>servlet-api</artifactId>
45+
<artifactId>javax.servlet-api</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>javax.portlet</groupId>
4949
<artifactId>portlet-api</artifactId>
50-
<version>1.0</version>
5150
</dependency>
5251
<!-- velocity and dependencies (logkit, oro, collections) -->
5352
<dependency>

‎calendar/calendar-impl/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</dependency>
6767
<dependency>
6868
<groupId>javax.servlet</groupId>
69-
<artifactId>servlet-api</artifactId>
69+
<artifactId>javax.servlet-api</artifactId>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.hibernate</groupId>

‎calendar/calendar-tool/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</dependency>
6767
<dependency>
6868
<groupId>javax.servlet</groupId>
69-
<artifactId>servlet-api</artifactId>
69+
<artifactId>javax.servlet-api</artifactId>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.springframework</groupId>

‎calendar/calendar-util/util/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</dependency>
6666
<dependency>
6767
<groupId>javax.servlet</groupId>
68-
<artifactId>servlet-api</artifactId>
68+
<artifactId>javax.servlet-api</artifactId>
6969
<scope>test</scope>
7070
</dependency>
7171
</dependencies>

‎chat/chat-impl/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependency>
2929
<dependency>
3030
<groupId>javax.servlet</groupId>
31-
<artifactId>servlet-api</artifactId>
31+
<artifactId>javax.servlet-api</artifactId>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.hibernate</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
26-
<artifactId>servlet-api</artifactId>
26+
<artifactId>javax.servlet-api</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.sakaiproject.kernel</groupId>

‎citations/citations-api/api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!--org.sakaiprojectsakai-util-api${sakai.version}-->
3737
<dependency>
3838
<groupId>javax.servlet</groupId>
39-
<artifactId>servlet-api</artifactId>
39+
<artifactId>javax.servlet-api</artifactId>
4040
</dependency>
4141
<dependency>
4242
<groupId>OKI</groupId>

‎citations/citations-impl/impl/pom.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependencies>
2323
<dependency>
2424
<groupId>javax.servlet</groupId>
25-
<artifactId>servlet-api</artifactId>
25+
<artifactId>javax.servlet-api</artifactId>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.sakaiproject.kernel</groupId>
@@ -113,12 +113,6 @@
113113
<artifactId>spring-context</artifactId>
114114
<scope>test</scope>
115115
</dependency>
116-
<dependency>
117-
<groupId>javax.servlet</groupId>
118-
<artifactId>javax.servlet-api</artifactId>
119-
<version>3.0.1</version>
120-
<scope>test</scope>
121-
</dependency>
122116
<dependency>
123117
<groupId>org.springframework</groupId>
124118
<artifactId>spring-test</artifactId>

‎citations/citations-osid/web2bridge/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependencies>
2525
<dependency>
2626
<groupId>javax.servlet</groupId>
27-
<artifactId>servlet-api</artifactId>
27+
<artifactId>javax.servlet-api</artifactId>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.sakaiproject.kernel</groupId>

‎citations/citations-servlet/servlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
26-
<artifactId>servlet-api</artifactId>
26+
<artifactId>javax.servlet-api</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.sakaiproject.kernel</groupId>

‎citations/citations-tool/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
26-
<artifactId>servlet-api</artifactId>
26+
<artifactId>javax.servlet-api</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.sakaiproject.kernel</groupId>

‎common/import-handlers/content-handlers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>javax.activation</groupId>
37-
<artifactId>activation</artifactId>
37+
<artifactId>javax.activation-api</artifactId>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.sakaiproject.common</groupId>

‎common/import-impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</dependency>
2626
<dependency>
2727
<groupId>javax.activation</groupId>
28-
<artifactId>activation</artifactId>
28+
<artifactId>javax.activation-api</artifactId>
2929
</dependency>
3030
<dependency>
3131
<groupId>jaxen</groupId>

‎common/import-util/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>javax.activation</groupId>
37-
<artifactId>activation</artifactId>
37+
<artifactId>javax.activation-api</artifactId>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.sakaiproject.common</groupId>

‎commons/impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>javax.servlet</groupId>
24-
<artifactId>servlet-api</artifactId>
24+
<artifactId>javax.servlet-api</artifactId>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.sakaiproject.kernel</groupId>

‎commons/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</dependency>
5151
<dependency>
5252
<groupId>javax.servlet</groupId>
53-
<artifactId>servlet-api</artifactId>
53+
<artifactId>javax.servlet-api</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>log4j</groupId>

‎content-review/api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</dependency>
2323
<dependency>
2424
<groupId>javax.servlet</groupId>
25-
<artifactId>servlet-api</artifactId>
25+
<artifactId>javax.servlet-api</artifactId>
2626
</dependency>
2727
</dependencies>
2828
</project>

‎content-review/impl/compilatio/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</dependency>
5151
<dependency>
5252
<groupId>javax.servlet</groupId>
53-
<artifactId>servlet-api</artifactId>
53+
<artifactId>javax.servlet-api</artifactId>
5454
</dependency>
5555
<!-- Apache commons dependencies -->
5656
<dependency>

‎content-review/impl/service/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</dependency>
6868
<dependency>
6969
<groupId>javax.servlet</groupId>
70-
<artifactId>servlet-api</artifactId>
70+
<artifactId>javax.servlet-api</artifactId>
7171
</dependency>
7272
</dependencies>
7373
</project>

‎content-review/impl/turnitin-oc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</dependency>
7272
<dependency>
7373
<groupId>javax.servlet</groupId>
74-
<artifactId>servlet-api</artifactId>
74+
<artifactId>javax.servlet-api</artifactId>
7575
<scope>provided</scope>
7676
</dependency>
7777

‎content-review/impl/turnitin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</dependency>
135135
<dependency>
136136
<groupId>javax.servlet</groupId>
137-
<artifactId>servlet-api</artifactId>
137+
<artifactId>javax.servlet-api</artifactId>
138138
</dependency>
139139
</dependencies>
140140
</project>

‎content-review/impl/urkund/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</dependency>
9595
<dependency>
9696
<groupId>javax.servlet</groupId>
97-
<artifactId>servlet-api</artifactId>
97+
<artifactId>javax.servlet-api</artifactId>
9898
</dependency>
9999

100100
<!-- Spring and Hibernate dependencies. -->

‎content-review/impl/vericite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dependency>
6262
<dependency>
6363
<groupId>javax.servlet</groupId>
64-
<artifactId>servlet-api</artifactId>
64+
<artifactId>javax.servlet-api</artifactId>
6565
</dependency>
6666
<!-- HTTP client: jersey-client -->
6767
<dependency>

‎content-review/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- we are running a webapp in a servlet container so we need the servlet API -->
2626
<dependency>
2727
<groupId>javax.servlet</groupId>
28-
<artifactId>servlet-api</artifactId>
28+
<artifactId>javax.servlet-api</artifactId>
2929
<scope>provided</scope>
3030
</dependency>
3131
<!-- third party dependencies -->

‎content/content-tool/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>javax.servlet</groupId>
30-
<artifactId>servlet-api</artifactId>
30+
<artifactId>javax.servlet-api</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.sakaiproject.kernel</groupId>

‎courier/courier-tool/tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>javax.servlet</groupId>
37-
<artifactId>servlet-api</artifactId>
37+
<artifactId>javax.servlet-api</artifactId>
3838
</dependency>
3939
</dependencies>
4040

‎dav/dav/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
26-
<artifactId>servlet-api</artifactId>
26+
<artifactId>javax.servlet-api</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.sakaiproject.kernel</groupId>

0 commit comments

Comments
 (0)