Skip to content

Commit

Permalink
pom.xml: downgrade Shiro
Browse files Browse the repository at this point in the history
See #36.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
  • Loading branch information
pierre committed Aug 25, 2020
1 parent fbe8472 commit a900f77
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ updates:
- dependency-name: org.antlr:stringtemplate
versions:
- ">= 4.0.0"
- dependency-name: org.apache.shiro:*
versions:
- "< 2.0.0"
- dependency-name: org.eclipse.jetty:*
versions:
- ">= 10.0.0"
Expand Down
1 change: 0 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
Update netty from 4.1.50.Final to 4.1.51.Final
Update postgresql from 42.1.4 to 42.2.16
Update redisson from 3.13.2 to 3.13.3
Update shiro from 1.3.2 to 1.6.0
Update spotbugs-annotations from 4.0.6 to 4.1.2
Update testng from 7.1.0 to 7.3.0

Expand Down
8 changes: 5 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -786,20 +786,22 @@
<version>4.2.2</version>
<classifier>all</classifier>
</dependency>
<!-- Because of https://issues.apache.org/jira/browse/SHIRO-679 (duplicate classes across artifacts),
we cannot upgrade until 2.0.0 is released (https://github.com/apache/shiro/pull/236) -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.6.0</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-guice</artifactId>
<version>1.6.0</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>1.6.0</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand Down

0 comments on commit a900f77

Please sign in to comment.