Skip to content

Commit

Permalink
SAK-40004 - Javax dependencies updated (sakaiproject#5851)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Raul Hidalgo Caballero authored and ern committed Aug 14, 2018
1 parent 19939c9 commit c27849c
Show file tree
Hide file tree
Showing 161 changed files with 207 additions and 237 deletions.
2 changes: 1 addition & 1 deletion access/access-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion admin-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion announcement/announcement-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand Down
2 changes: 1 addition & 1 deletion announcement/announcement-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
2 changes: 1 addition & 1 deletion assignment/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion assignment/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-blis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-portlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
3 changes: 1 addition & 2 deletions basiclti/portlet-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions basiclti/tsugi-util/pom-tsugi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/tsugi-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Sakai-specific code needs to be placed in the basiclti-common folder -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
3 changes: 1 addition & 2 deletions basiclti/web-ifp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
</dependency>
<!-- velocity and dependencies (logkit, oro, collections) -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion calendar/calendar-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand Down
2 changes: 1 addition & 1 deletion calendar/calendar-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
2 changes: 1 addition & 1 deletion calendar/calendar-util/util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion chat/chat-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand Down
2 changes: 1 addition & 1 deletion chat/chat-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion citations/citations-api/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<!--org.sakaiprojectsakai-util-api${sakai.version}-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>OKI</groupId>
Expand Down
8 changes: 1 addition & 7 deletions citations/citations-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down Expand Up @@ -113,12 +113,6 @@
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion citations/citations-osid/web2bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion citations/citations-servlet/servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion citations/citations-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion common/import-handlers/content-handlers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.common</groupId>
Expand Down
2 changes: 1 addition & 1 deletion common/import-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>jaxen</groupId>
Expand Down
2 changes: 1 addition & 1 deletion common/import-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.common</groupId>
Expand Down
2 changes: 1 addition & 1 deletion commons/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion commons/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion content-review/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion content-review/impl/compilatio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- Apache commons dependencies -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion content-review/impl/service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion content-review/impl/turnitin-oc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion content-review/impl/turnitin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion content-review/impl/urkund/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>

<!-- Spring and Hibernate dependencies. -->
Expand Down
2 changes: 1 addition & 1 deletion content-review/impl/vericite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- HTTP client: jersey-client -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion content-review/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<!-- we are running a webapp in a servlet container so we need the servlet API -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- third party dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion content/content-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion courier/courier-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion dav/dav/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down
Loading

0 comments on commit c27849c

Please sign in to comment.