From 572c9f3788f05f9f9fd1c5a33728b717fed5419a Mon Sep 17 00:00:00 2001 From: lprimak Date: Wed, 4 Oct 2023 01:32:50 -0500 Subject: [PATCH] revert more unnecessary files --- .../activedirectory/ActiveDirectoryRealm.java | 2 +- .../src/main/resources/test-keystore.jks | Bin 2782 -> 2272 bytes .../src/main/resources/test-keystore.pem | 40 +++++++++--------- pom.xml | 11 ++--- .../ee/filters/FormAuthenticationFilter.java | 2 - 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/core/src/main/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealm.java b/core/src/main/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealm.java index 98a894cbaf..144208dde8 100644 --- a/core/src/main/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealm.java +++ b/core/src/main/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealm.java @@ -91,7 +91,7 @@ public void setGroupRolesMap(Map groupRolesMap) { /** * Builds an {@link AuthenticationInfo} object by querying the active directory LDAP context for the * specified username. This method binds to the LDAP server using the provided username and password - - * which is successful, indicates that the password is correct. + * which, if successful, indicates that the password is correct. *

* This method can be overridden by subclasses to query the LDAP server in a more complex way. * diff --git a/integration-tests/support/src/main/resources/test-keystore.jks b/integration-tests/support/src/main/resources/test-keystore.jks index 380dffe2b0e006b47477af0a591e2c2327fd9645..0cea846c1d038bb1ff0fa0237390f6f8b7af1829 100644 GIT binary patch literal 2272 zcmchY`8(8m8^`B6i+!C@ma%2amif-ulS0XwHATo_493n74`msVCCgOyBU8$fEm;~{ zjVUQ1WGMzGj(tm(ki(;MJ?HBD1v4m zSJGHjO);V6sQB_78^QF*{MzqnJnK1ck3Iw_sMTIzvFK8=&w`+AL~`G>w_iiqbY9pO9mgy^*qt*n`W znKPG-^uCq^WS3hU70qjk&D&*8F%3op?;*2ImsHE;uXQk*@->+BT>6PEta!Wa)}O@g zS7pwT3r#^^g_z+pr`{ejdCpewnP)-bY0t~F)ZLapPGwCpp3epT9$#bjV!V&x-iXr8YHX#UyI=)BL2g zvS+fYvS!a-4F1xr6keOcm7u1(>v37O^u=%Y*9MDf4NU7_d)F0OvD+rP;AYPZN>}O^MIKO#AWac^O4qPsT82etz`CYeu0wpFivFzTkBVSsl!S^fxQvC zWTrbDePq;e`#Q*1&k~C!(&r5!=h*Jm`hT9^E?B&Os#484eacJRg8t*oGhv+(uY&st z_kuwGj|8g@@|Bp1ZWj%&koD?PKHUqv<^Bhl4N~3qs37Z}@$%guU$`@W$0(6D8d4 z(9Q0A*q)6Evu0eebqCz(g117)>I3KjE34<5lYClnVv@3M;g<~T)>At5UTdgx#Dw=C zXWNnLvgfw~;nLgY#DY`Ue#^D8_onRiy@J^vDOx?)xJP!cH}w~+pJwLc z-Kr`QFFcAE&e`3_r`XOFBXO5PgXjrZ3yQ2l@n*z}9N(R;HAx!S9(_B{um$@cKP0R5 z;Hans*&W7_Wn{$7FxMqgtNxHPrl-daY=;O4b79znXZ|Y7Rl@JJy|b|q@k;ya-QVem zuvbwBwILALU62e*2g%SdDhvuhp>Qtmxn7W)g`t0B|B8pdS_q^0C0|;4sv$ zRK@Zg=I9~gM6ufW`}hZh`Ts*Weh~o>`BTG+;a1Cc^89; zN2hIJ?G5Yv+e264{hFYi&sAaq(0&gy8(;lI{JCo#=6cqr73H zg^qpwCtl8jaCUYse21-Q(wAdb=PWc^6dxyfJYQt9Gy9+xL|`Tf3Vy(<%GB(H{3n$b+H!Daj}V?5tC*&u|S?Oila)8Eu5sA zQO{?N_U)vgBeUP=o1`qo%hVS0>;bn8b7qY4Ooc3*^J3DUEmqujUCn=+9AzA$qzWU6 z*!SfIss}5pe^Zg<(}(KkqTTIsveRVzV_#Akreoh8O^ybbbtIZJ)0^Jop)ddf6lsF$ zpupi9it)p_K~D0oI|0RhQXcqGxIphKTt7OhLvl&Y-47ArF`0^Pko~u{hqrcUEdWV5 zUbQ`r>eUppd02qyb$IdlbJKkIkL3r2tb+@S>1{Qz{bWK8jdSAxM?(Xo(peg~b-Yah zTF74~8aCf}v&H)Xu_`4;8u| z|J-0QcD3H6nAr1u$){Ge(QVZ`Hhc9Pjp*&d%%c+xopO(PUQCY(ZChVf&^_o_)m9!4 z)Rd=CP=y2C$OVrrpl2P->z2+jy6D>HUmE8b{x2Az;Qs&s literal 2782 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 true - true - + true true ${root.dir}/src/japicmp/postAnalysisScript.groovy @@ -756,9 +755,7 @@ - The mission of the Apache Shiro project is to create and maintain an easy to use - authentication and authorization framework. - + The mission of the Apache Shiro project is to create and maintain an easy to use authentication and authorization framework. ${project.url} @@ -1487,9 +1484,7 @@ https://docs.spring.io/spring/docs/2.5.x/javadoc-api/ https://junit.org/junit4/javadoc/4.12/ https://easymock.org/api/ - - https://javadoc.io/doc/org.mockito/mockito-core/${mockito.version}/org/mockito/Mockito.html - + https://javadoc.io/doc/org.mockito/mockito-core/${mockito.version}/org/mockito/Mockito.html https://www.quartz-scheduler.org/api/1.8.6/ diff --git a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormAuthenticationFilter.java b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormAuthenticationFilter.java index 85ab2e9209..b11b41ecd6 100644 --- a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormAuthenticationFilter.java +++ b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormAuthenticationFilter.java @@ -72,8 +72,6 @@ public boolean preHandle(ServletRequest request, ServletResponse response) throw } } - ; - public FormAuthenticationFilter() { delegate = new AuthenticationFilterDelegate(new Methods()); }