Skip to content

Commit

Permalink
SAK-32273 upgrade spring dependencies to 4.3.6 (sakaiproject#4012)
Browse files Browse the repository at this point in the history
* SAK-32273 upgrade spring dependencies to 4.3.6

* SAK-32272 Matt says Spring 4.3 needs SpringJUnit4ClassRunner requires JUnit 4.12 or higher

* Removing my lib changes

* Removing ckeditor change
  • Loading branch information
ottenhoff authored and jonespm committed Mar 3, 2017
1 parent 10a2549 commit 171708c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion login/login-tool/tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>org.springframework.security.extensions</groupId>
<artifactId>spring-security-saml2-core</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.jasig.cas.client</groupId>
Expand Down
8 changes: 4 additions & 4 deletions master/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@
<sakai.simple-xml.version>2.6</sakai.simple-xml.version>
<sakai.spring.groupId>org.springframework</sakai.spring.groupId>
<sakai.spring.artifactId>spring-core</sakai.spring.artifactId>
<sakai.spring.version>4.2.7.RELEASE</sakai.spring.version>
<sakai.spring.security.version>3.2.9.RELEASE</sakai.spring.security.version>
<sakai.spring.version>4.3.6.RELEASE</sakai.spring.version>
<sakai.spring.security.version>3.2.10.RELEASE</sakai.spring.security.version>
<sakai.spring.test.artifactId>spring-test</sakai.spring.test.artifactId>
<sakai.spring.test.version>4.1.9.RELEASE</sakai.spring.test.version>
<sakai.spring.test.version>4.3.6.RELEASE</sakai.spring.test.version>
<sakai.tika.version>1.14</sakai.tika.version>
<sakai.tomcat.version>8.0.41</sakai.tomcat.version>
<sakai.velocity.version>1.6.4</sakai.velocity.version>
Expand Down Expand Up @@ -1692,7 +1692,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 171708c

Please sign in to comment.