diff --git a/BUILD.bazel b/BUILD.bazel index e1328aa..b84458a 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -41,7 +41,7 @@ java_library( "@maven//:org_springframework_spring_context", "@maven//:org_springframework_spring_web", - "@maven//:org_apache_shiro_shiro_spring_boot_starter", + # "@maven//:org_apache_shiro_shiro_spring_boot_starter", "@maven//:org_apache_shiro_shiro_core", "@maven//:org_apache_shiro_shiro_spring", "@maven//:org_apache_shiro_shiro_web", diff --git a/WORKSPACE b/WORKSPACE index 9e5b5a8..8a5cdde 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,46 +27,63 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") # for https://github.com/apache/shiro/issues/891 shiros = [ - maven.artifact( - group ="org.apache.shiro", - artifact = "shiro-spring-boot-web-starter", - version = "1.12.0", - # classifier = "jakarta", - ), - maven.artifact( - group ="org.apache.shiro", - artifact = "shiro-spring-boot-starter", - version = "1.12.0", - # classifier = "jakarta", - ), + # maven.artifact( + # group ="org.apache.shiro", + # artifact = "shiro-spring-boot-web-starter", + # version = "1.13.0", + # exclusions = [ + # maven.exclusion( + # group = "org.apache.shiro", + # artifact = "shiro-core", + # ), + # maven.exclusion( + # group = "org.apache.shiro", + # artifact = "shiro-web", + # ), + # ], + # #classifier = "jakarta", + # ), + # maven.artifact( + # group ="org.apache.shiro", + # artifact = "shiro-spring-boot-starter", + # version = "1.13.0", + # #classifier = "jakarta", + # ), maven.artifact( group = "org.apache.shiro", artifact = "shiro-spring", - version = "1.12.0", - classifier = "jakarta", + version = "1.13.0", + #classifier = "jakarta", # exclusions = [ # maven.exclusion( - # group = "javax.servlet", - # artifact = "*", + # group = "org.apache.shiro", + # artifact = "shiro-core", # ), # maven.exclusion( # group = "org.apache.shiro", - # artifact = "*", + # artifact = "shiro-web", # ), # ] ), maven.artifact( group = "org.apache.shiro", - artifact = "shiro-web", - version ="1.12.0", - classifier = "jakarta", + artifact = "shiro-core", + version = "1.13.0", + #classifier = "jakarta", ), - maven.artifact( + maven.artifact( group = "org.apache.shiro", - artifact = "shiro-core", - version ="1.12.0", - classifier = "jakarta", - ) + artifact = "shiro-web", + version = "1.13.0", + #classifier = "jakarta", + # exclusions = [ + # maven.exclusion( + # group = "org.apache.shiro", + # artifact = "shiro-core", + # ), + # ] + ), + ] maven_install( diff --git a/build.gradle b/build.gradle index f204312..5c71263 100644 --- a/build.gradle +++ b/build.gradle @@ -27,9 +27,18 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-quartz' implementation 'org.springframework.boot:spring-boot-starter-aop' implementation 'io.springfox:springfox-boot-starter:3.0.0' - implementation 'org.apache.shiro:shiro-spring-boot-starter:1.12.0:jakarta' - implementation('org.apache.shiro:shiro-spring:1.12.0:jakarta') { exclude group: 'org.apache.shiro', module: 'shiro-web' } - implementation 'org.apache.shiro:shiro-web:1.12.0:jakarta' + implementation 'org.apache.shiro:shiro-spring-boot-web-starter:1.13.0' + implementation('org.apache.shiro:shiro-spring:1.13.0:jakarta') { + exclude group: 'org.apache.shiro', module: 'shiro-core' + exclude group: 'org.apache.shiro', module: 'shiro-web' + } + implementation 'org.apache.shiro:shiro-core:1.13.0:jakarta' + implementation 'org.apache.shiro:shiro-web:1.13.0:jakarta' + // implementation 'org.apache.shiro:shiro-spring-boot-starter:2.0.0-alpha-4:jakarta' + // implementation 'org.apache.shiro:shiro-spring-boot-web-starter:2.0.0-alpha-4:jakarta' + // implementation 'org.apache.shiro:shiro-spring:2.0.0-alpha-4:jakarta' + // implementation 'org.apache.shiro:shiro-web:2.0.0-alpha-4:jakarta' + implementation 'com.auth0:java-jwt:3.19.4' implementation 'org.postgresql:postgresql' diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..179e88d --- /dev/null +++ b/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.2 + + + org.daming + jobs + 0.0.1-SNAPSHOT + jobs + Demo project for Spring Boot + + + 21 + + 21 + 21 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-quartz + + + io.springfox + springfox-boot-starter + 3.0.0 + + + + org.apache.shiro + shiro-spring + jakarta + 1.13.0 + + + + org.apache.shiro + shiro-core + + + org.apache.shiro + shiro-web + + + + + + org.apache.shiro + shiro-core + jakarta + 1.13.0 + + + org.apache.shiro + shiro-web + jakarta + 1.13.0 + + + org.apache.shiro + shiro-core + + + + + com.auth0 + java-jwt + 3.19.4 + + + org.postgresql + postgresql + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file