You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2022/06/23 19:23:55 UTC
[shiro] branch 1.9.x updated (422166dd -> 249c792b)
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a change to branch 1.9.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
from 422166dd Merge pull request #364 from apache/shiro-871-19x
new 6bcb92e0 Add support for case-insensitive matching to RegExPatternMatcher
new 2b532117 [maven-release-plugin] prepare release shiro-root-1.9.1
new 249c792b [maven-release-plugin] prepare for next development iteration
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
all/pom.xml | 2 +-
cache/pom.xml | 2 +-
config/core/pom.xml | 3 +-
config/ogdl/pom.xml | 3 +-
config/pom.xml | 2 +-
core/pom.xml | 2 +-
.../org/apache/shiro/util/RegExPatternMatcher.java | 26 +++++++++++-
.../apache/shiro/util/RegExPatternMatcherTest.java | 46 ++++++++++++++++++----
crypto/cipher/pom.xml | 3 +-
crypto/core/pom.xml | 3 +-
crypto/hash/pom.xml | 3 +-
crypto/pom.xml | 2 +-
event/pom.xml | 2 +-
integration-tests/guice3/pom.xml | 3 +-
integration-tests/guice4/pom.xml | 3 +-
integration-tests/pom.xml | 2 +-
integration-tests/support/pom.xml | 3 +-
lang/pom.xml | 2 +-
pom.xml | 4 +-
samples/aspectj/pom.xml | 3 +-
samples/guice/pom.xml | 3 +-
samples/jaxrs/pom.xml | 3 +-
samples/pom.xml | 2 +-
samples/quickstart-guice/pom.xml | 3 +-
samples/quickstart/pom.xml | 3 +-
samples/servlet-plugin/pom.xml | 3 +-
samples/spring-boot-web/pom.xml | 3 +-
samples/spring-boot/pom.xml | 3 +-
samples/spring-hibernate/pom.xml | 3 +-
samples/spring-mvc/pom.xml | 2 +-
samples/spring/pom.xml | 3 +-
samples/web/pom.xml | 3 +-
support/aspectj/pom.xml | 3 +-
support/cas/pom.xml | 3 +-
support/ehcache/pom.xml | 3 +-
support/features/pom.xml | 3 +-
support/guice/pom.xml | 2 +-
support/hazelcast/pom.xml | 3 +-
support/jaxrs/pom.xml | 3 +-
support/pom.xml | 2 +-
support/quartz/pom.xml | 3 +-
support/servlet-plugin/pom.xml | 3 +-
support/spring-boot/pom.xml | 3 +-
support/spring-boot/spring-boot-starter/pom.xml | 2 +-
.../spring-boot/spring-boot-web-starter/pom.xml | 3 +-
support/spring/pom.xml | 3 +-
test-coverage/pom.xml | 2 +-
tools/hasher/pom.xml | 3 +-
tools/pom.xml | 2 +-
web/pom.xml | 2 +-
50 files changed, 111 insertions(+), 90 deletions(-)
[shiro] 02/03: [maven-release-plugin] prepare release shiro-root-1.9.1
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch 1.9.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 2b532117ac341a47c27ea8c17262e79fe54aee32
Author: Brian Demers <bd...@apache.org>
AuthorDate: Thu Jun 23 14:55:17 2022 -0400
[maven-release-plugin] prepare release shiro-root-1.9.1
---
all/pom.xml | 2 +-
cache/pom.xml | 2 +-
config/core/pom.xml | 6 +++++-
config/ogdl/pom.xml | 6 +++++-
config/pom.xml | 2 +-
core/pom.xml | 2 +-
crypto/cipher/pom.xml | 6 +++++-
crypto/core/pom.xml | 6 +++++-
crypto/hash/pom.xml | 6 +++++-
crypto/pom.xml | 2 +-
event/pom.xml | 2 +-
integration-tests/guice3/pom.xml | 6 +++++-
integration-tests/guice4/pom.xml | 6 +++++-
integration-tests/pom.xml | 2 +-
integration-tests/support/pom.xml | 6 +++++-
lang/pom.xml | 2 +-
pom.xml | 6 +++---
samples/aspectj/pom.xml | 6 +++++-
samples/guice/pom.xml | 6 +++++-
samples/jaxrs/pom.xml | 6 +++++-
samples/pom.xml | 2 +-
samples/quickstart-guice/pom.xml | 6 +++++-
samples/quickstart/pom.xml | 6 +++++-
samples/servlet-plugin/pom.xml | 6 +++++-
samples/spring-boot-web/pom.xml | 6 +++++-
samples/spring-boot/pom.xml | 6 +++++-
samples/spring-hibernate/pom.xml | 6 +++++-
samples/spring-mvc/pom.xml | 6 +++++-
samples/spring/pom.xml | 6 +++++-
samples/web/pom.xml | 6 +++++-
support/aspectj/pom.xml | 6 +++++-
support/cas/pom.xml | 6 +++++-
support/ehcache/pom.xml | 6 +++++-
support/features/pom.xml | 6 +++++-
support/guice/pom.xml | 6 +++++-
support/hazelcast/pom.xml | 6 +++++-
support/jaxrs/pom.xml | 6 +++++-
support/pom.xml | 2 +-
support/quartz/pom.xml | 6 +++++-
support/servlet-plugin/pom.xml | 6 +++++-
support/spring-boot/pom.xml | 6 +++++-
support/spring-boot/spring-boot-starter/pom.xml | 6 +++++-
support/spring-boot/spring-boot-web-starter/pom.xml | 6 +++++-
support/spring/pom.xml | 6 +++++-
test-coverage/pom.xml | 2 +-
tools/hasher/pom.xml | 6 +++++-
tools/pom.xml | 2 +-
web/pom.xml | 2 +-
48 files changed, 186 insertions(+), 50 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index f05a853e..c7edf4d2 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cache/pom.xml b/cache/pom.xml
index cecd144e..c53e1b83 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 6f56da6e..85e27cb4 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -58,4 +58,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index cb0270a5..8a4ef4d7 100644
--- a/config/ogdl/pom.xml
+++ b/config/ogdl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -103,4 +103,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/config/pom.xml b/config/pom.xml
index 330df0fb..20089411 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-config</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index d579aa56..c1d6bd53 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index 7fc6eb58..8bb367a2 100644
--- a/crypto/cipher/pom.xml
+++ b/crypto/cipher/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -79,4 +79,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index cc6c3210..5b7aceb6 100644
--- a/crypto/core/pom.xml
+++ b/crypto/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -57,4 +57,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index e1e675e3..7494b271 100644
--- a/crypto/hash/pom.xml
+++ b/crypto/hash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -79,4 +79,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/crypto/pom.xml b/crypto/pom.xml
index 3b8d296a..ccfce659 100644
--- a/crypto/pom.xml
+++ b/crypto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-crypto</artifactId>
diff --git a/event/pom.xml b/event/pom.xml
index d2324678..1744ea14 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index 1a065fc6..8ac5640a 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-its-guice3</artifactId>
@@ -124,4 +124,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 3802742f..3b1a727f 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-its-guice4</artifactId>
@@ -129,4 +129,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 72f534f9..c7d3f4e9 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<groupId>org.apache.shiro.integrationtests</groupId>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index f54c331f..5e5b63cd 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-its-support</artifactId>
@@ -131,4 +131,8 @@
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/lang/pom.xml b/lang/pom.xml
index c6f9799c..ff1dc8f0 100644
--- a/lang/pom.xml
+++ b/lang/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index c2825264..0fbd878f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<packaging>pom</packaging>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
<name>Apache Shiro</name>
<url>https://shiro.apache.org/</url>
@@ -44,7 +44,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</developerConnection>
<url>https://github.com/apache/shiro/tree/${project.scm.tag}</url>
- <tag>master</tag>
+ <tag>shiro-root-1.9.1</tag>
</scm>
<issueManagement>
<system>Jira</system>
@@ -69,7 +69,7 @@
<shiro.previousVersion>1.7.1</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
- <project.build.outputTimestamp>2022-03-22T23:08:15Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2022-06-23T18:51:39Z</project.build.outputTimestamp>
<jacoco.skip>true</jacoco.skip>
<nexus.deploy.skip>false</nexus.deploy.skip>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index ebda72c0..996654d9 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -90,4 +90,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index d3722ee0..b77a65ee 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -112,4 +112,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index 3d619bd0..31ff0b53 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -210,4 +210,8 @@
</profiles>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/pom.xml b/samples/pom.xml
index 0d13dd36..4fae3197 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml
index 6750c860..b509895f 100644
--- a/samples/quickstart-guice/pom.xml
+++ b/samples/quickstart-guice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -79,4 +79,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml
index b07edc42..7e9f40da 100644
--- a/samples/quickstart/pom.xml
+++ b/samples/quickstart/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,4 +77,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index 4f28fb15..b136a3f3 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -140,4 +140,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
index a89dd11b..7a09558a 100644
--- a/samples/spring-boot-web/pom.xml
+++ b/samples/spring-boot-web/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>samples-spring-boot-web</artifactId>
@@ -86,4 +86,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index ec4d4dff..707f785a 100644
--- a/samples/spring-boot/pom.xml
+++ b/samples/spring-boot/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>samples-spring-boot</artifactId>
@@ -78,4 +78,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index 0f967225..aa9aa63e 100644
--- a/samples/spring-hibernate/pom.xml
+++ b/samples/spring-hibernate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -143,4 +143,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index af7fe198..796fce4c 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -129,4 +129,8 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 72c71bf4..9ad2a04e 100644
--- a/samples/spring/pom.xml
+++ b/samples/spring/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,4 +77,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 54354cf0..48b31ab7 100644
--- a/samples/web/pom.xml
+++ b/samples/web/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -133,4 +133,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index b3ae3b6d..5dfe7118 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -101,4 +101,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
index 7a967890..6b2fd7bb 100644
--- a/support/cas/pom.xml
+++ b/support/cas/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -85,4 +85,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index e7aa0d8c..bada463c 100644
--- a/support/ehcache/pom.xml
+++ b/support/ehcache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,4 +77,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index c03ab3c4..9371e97c 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -138,4 +138,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index c116bf44..c1ad8791 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -120,4 +120,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 5c5a686c..767ea0e1 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,4 +94,8 @@
</profile>
</profiles>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index b506365b..70d5ce02 100644
--- a/support/jaxrs/pom.xml
+++ b/support/jaxrs/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,4 +77,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/pom.xml b/support/pom.xml
index 232c2c8a..d844f40e 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 2edda6bd..b29e6fda 100644
--- a/support/quartz/pom.xml
+++ b/support/quartz/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -77,4 +77,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml
index ca98b1c4..de27630c 100644
--- a/support/servlet-plugin/pom.xml
+++ b/support/servlet-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-servlet-plugin</artifactId>
@@ -65,4 +65,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
index 002923b6..cae99582 100644
--- a/support/spring-boot/pom.xml
+++ b/support/spring-boot/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,4 +49,8 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
index 4dfa157b..d5b5ef66 100644
--- a/support/spring-boot/spring-boot-starter/pom.xml
+++ b/support/spring-boot/spring-boot-starter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-spring-boot-starter</artifactId>
@@ -112,4 +112,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
index 3e25aff4..c694aee8 100644
--- a/support/spring-boot/spring-boot-web-starter/pom.xml
+++ b/support/spring-boot/spring-boot-web-starter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<artifactId>shiro-spring-boot-web-starter</artifactId>
@@ -73,4 +73,8 @@
</dependencies>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 2727e7c8..42623047 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -109,4 +109,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index 8239f7be..0409385f 100644
--- a/test-coverage/pom.xml
+++ b/test-coverage/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
index da9eb2d7..55703166 100644
--- a/tools/hasher/pom.xml
+++ b/tools/hasher/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro.tools</groupId>
<artifactId>shiro-tools</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -97,4 +97,8 @@
</plugins>
</build>
+
+ <scm>
+ <tag>shiro-root-1.9.1</tag>
+ </scm>
</project>
diff --git a/tools/pom.xml b/tools/pom.xml
index 83435c3c..d877ddb9 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/web/pom.xml b/web/pom.xml
index 13f7b49b..7fde20b1 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[shiro] 03/03: [maven-release-plugin] prepare for next development iteration
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch 1.9.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 249c792b536f75557177b4caebd15d62eab3b3c7
Author: Brian Demers <bd...@apache.org>
AuthorDate: Thu Jun 23 14:55:19 2022 -0400
[maven-release-plugin] prepare for next development iteration
---
all/pom.xml | 2 +-
cache/pom.xml | 2 +-
config/core/pom.xml | 7 +------
config/ogdl/pom.xml | 7 +------
config/pom.xml | 2 +-
core/pom.xml | 2 +-
crypto/cipher/pom.xml | 7 +------
crypto/core/pom.xml | 7 +------
crypto/hash/pom.xml | 7 +------
crypto/pom.xml | 2 +-
event/pom.xml | 2 +-
integration-tests/guice3/pom.xml | 7 +------
integration-tests/guice4/pom.xml | 7 +------
integration-tests/pom.xml | 2 +-
integration-tests/support/pom.xml | 7 +------
lang/pom.xml | 2 +-
pom.xml | 6 +++---
samples/aspectj/pom.xml | 7 +------
samples/guice/pom.xml | 7 +------
samples/jaxrs/pom.xml | 7 +------
samples/pom.xml | 2 +-
samples/quickstart-guice/pom.xml | 7 +------
samples/quickstart/pom.xml | 7 +------
samples/servlet-plugin/pom.xml | 7 +------
samples/spring-boot-web/pom.xml | 7 +------
samples/spring-boot/pom.xml | 7 +------
samples/spring-hibernate/pom.xml | 7 +------
samples/spring-mvc/pom.xml | 6 +-----
samples/spring/pom.xml | 7 +------
samples/web/pom.xml | 7 +------
support/aspectj/pom.xml | 7 +------
support/cas/pom.xml | 7 +------
support/ehcache/pom.xml | 7 +------
support/features/pom.xml | 7 +------
support/guice/pom.xml | 6 +-----
support/hazelcast/pom.xml | 7 +------
support/jaxrs/pom.xml | 7 +------
support/pom.xml | 2 +-
support/quartz/pom.xml | 7 +------
support/servlet-plugin/pom.xml | 7 +------
support/spring-boot/pom.xml | 7 +------
support/spring-boot/spring-boot-starter/pom.xml | 6 +-----
support/spring-boot/spring-boot-web-starter/pom.xml | 7 +------
support/spring/pom.xml | 7 +------
test-coverage/pom.xml | 2 +-
tools/hasher/pom.xml | 7 +------
tools/pom.xml | 2 +-
web/pom.xml | 2 +-
48 files changed, 50 insertions(+), 217 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index c7edf4d2..28c7f501 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/cache/pom.xml b/cache/pom.xml
index c53e1b83..395db539 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 85e27cb4..e35e4ea9 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -57,9 +57,4 @@
<artifactId>shiro-lang</artifactId>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index 8a4ef4d7..32e9a10d 100644
--- a/config/ogdl/pom.xml
+++ b/config/ogdl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -102,9 +102,4 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/config/pom.xml b/config/pom.xml
index 20089411..c0077e0a 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-config</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index c1d6bd53..52bcf315 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index 8bb367a2..b63327b4 100644
--- a/crypto/cipher/pom.xml
+++ b/crypto/cipher/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -78,9 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index 5b7aceb6..ab58d0ef 100644
--- a/crypto/core/pom.xml
+++ b/crypto/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -56,9 +56,4 @@
<artifactId>shiro-lang</artifactId>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 7494b271..5a8ef8db 100644
--- a/crypto/hash/pom.xml
+++ b/crypto/hash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -78,9 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/crypto/pom.xml b/crypto/pom.xml
index ccfce659..76f83a67 100644
--- a/crypto/pom.xml
+++ b/crypto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-crypto</artifactId>
diff --git a/event/pom.xml b/event/pom.xml
index 1744ea14..dac6aeda 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index 8ac5640a..d3ac0750 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-its-guice3</artifactId>
@@ -123,9 +123,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 3b1a727f..c79dd836 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-its-guice4</artifactId>
@@ -128,9 +128,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index c7d3f4e9..699f665d 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.shiro.integrationtests</groupId>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index 5e5b63cd..ea5e1a43 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-its-support</artifactId>
@@ -130,9 +130,4 @@
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/lang/pom.xml b/lang/pom.xml
index ff1dc8f0..16325cdb 100644
--- a/lang/pom.xml
+++ b/lang/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 0fbd878f..bfe416a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<packaging>pom</packaging>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
<name>Apache Shiro</name>
<url>https://shiro.apache.org/</url>
@@ -44,7 +44,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/shiro.git</developerConnection>
<url>https://github.com/apache/shiro/tree/${project.scm.tag}</url>
- <tag>shiro-root-1.9.1</tag>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>Jira</system>
@@ -69,7 +69,7 @@
<shiro.previousVersion>1.7.1</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
- <project.build.outputTimestamp>2022-06-23T18:51:39Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2022-06-23T18:55:19Z</project.build.outputTimestamp>
<jacoco.skip>true</jacoco.skip>
<nexus.deploy.skip>false</nexus.deploy.skip>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index 996654d9..bab64ba0 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -89,9 +89,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index b77a65ee..87ba6467 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -111,9 +111,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index 31ff0b53..0738d165 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -209,9 +209,4 @@
</profile>
</profiles>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/pom.xml b/samples/pom.xml
index 4fae3197..f9be3519 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml
index b509895f..679a314d 100644
--- a/samples/quickstart-guice/pom.xml
+++ b/samples/quickstart-guice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -78,9 +78,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml
index 7e9f40da..04c5e1d1 100644
--- a/samples/quickstart/pom.xml
+++ b/samples/quickstart/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,9 +76,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index b136a3f3..9316c34b 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -139,9 +139,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
index 7a09558a..20c76790 100644
--- a/samples/spring-boot-web/pom.xml
+++ b/samples/spring-boot-web/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>samples-spring-boot-web</artifactId>
@@ -85,9 +85,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index 707f785a..6708fc80 100644
--- a/samples/spring-boot/pom.xml
+++ b/samples/spring-boot/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>samples-spring-boot</artifactId>
@@ -77,9 +77,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index aa9aa63e..f0a72727 100644
--- a/samples/spring-hibernate/pom.xml
+++ b/samples/spring-hibernate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -142,9 +142,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 796fce4c..69f32cb3 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -129,8 +129,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 9ad2a04e..10d5fee8 100644
--- a/samples/spring/pom.xml
+++ b/samples/spring/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,9 +76,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 48b31ab7..ce797401 100644
--- a/samples/web/pom.xml
+++ b/samples/web/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -132,9 +132,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index 5dfe7118..543ed72b 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -100,9 +100,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
index 6b2fd7bb..f995485d 100644
--- a/support/cas/pom.xml
+++ b/support/cas/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -84,9 +84,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index bada463c..712f88c4 100644
--- a/support/ehcache/pom.xml
+++ b/support/ehcache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,9 +76,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 9371e97c..b65e3856 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -137,9 +137,4 @@
<!-- </plugin>-->
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index c1ad8791..39d0e0d8 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -120,8 +120,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 767ea0e1..fe30ea5c 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -93,9 +93,4 @@
</properties>
</profile>
</profiles>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index 70d5ce02..eaaa051c 100644
--- a/support/jaxrs/pom.xml
+++ b/support/jaxrs/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,9 +76,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/pom.xml b/support/pom.xml
index d844f40e..11f172bf 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index b29e6fda..df47420e 100644
--- a/support/quartz/pom.xml
+++ b/support/quartz/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,9 +76,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml
index de27630c..cba278c0 100644
--- a/support/servlet-plugin/pom.xml
+++ b/support/servlet-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-servlet-plugin</artifactId>
@@ -64,9 +64,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
index cae99582..ababd4e8 100644
--- a/support/spring-boot/pom.xml
+++ b/support/spring-boot/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -48,9 +48,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
index d5b5ef66..8cda6b8b 100644
--- a/support/spring-boot/spring-boot-starter/pom.xml
+++ b/support/spring-boot/spring-boot-starter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-spring-boot-starter</artifactId>
@@ -112,8 +112,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
index c694aee8..3f2a938e 100644
--- a/support/spring-boot/spring-boot-web-starter/pom.xml
+++ b/support/spring-boot/spring-boot-web-starter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<artifactId>shiro-spring-boot-web-starter</artifactId>
@@ -72,9 +72,4 @@
</dependency>
</dependencies>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 42623047..5e129682 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -108,9 +108,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index 0409385f..8457cbaf 100644
--- a/test-coverage/pom.xml
+++ b/test-coverage/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
index 55703166..a1d6a435 100644
--- a/tools/hasher/pom.xml
+++ b/tools/hasher/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro.tools</groupId>
<artifactId>shiro-tools</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -96,9 +96,4 @@
</plugin>
</plugins>
</build>
-
-
- <scm>
- <tag>shiro-root-1.9.1</tag>
- </scm>
</project>
diff --git a/tools/pom.xml b/tools/pom.xml
index d877ddb9..b755bc43 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/web/pom.xml b/web/pom.xml
index 7fde20b1..f60e6469 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[shiro] 01/03: Add support for case-insensitive matching to RegExPatternMatcher
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch 1.9.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 6bcb92e06fa588b9c7790dd01bc02135d58d3f5b
Author: Brian Demers <bd...@apache.org>
AuthorDate: Tue May 31 20:06:56 2022 -0400
Add support for case-insensitive matching to RegExPatternMatcher
---
.../org/apache/shiro/util/RegExPatternMatcher.java | 26 +++++++++++-
.../apache/shiro/util/RegExPatternMatcherTest.java | 46 ++++++++++++++++++----
2 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/shiro/util/RegExPatternMatcher.java b/core/src/main/java/org/apache/shiro/util/RegExPatternMatcher.java
index b251ac50..b07ce3d0 100644
--- a/core/src/main/java/org/apache/shiro/util/RegExPatternMatcher.java
+++ b/core/src/main/java/org/apache/shiro/util/RegExPatternMatcher.java
@@ -29,12 +29,18 @@ import java.util.regex.Matcher;
*/
public class RegExPatternMatcher implements PatternMatcher {
+ private static final int DEFAULT = Pattern.DOTALL;
+
+ private static final int CASE_INSENSITIVE = DEFAULT | Pattern.CASE_INSENSITIVE;
+
+ private boolean caseInsensitive = false;
+
/**
* Simple implementation that merely uses the default pattern comparison logic provided by the
* JDK.
* <p/>This implementation essentially executes the following:
* <pre>
- * Pattern p = Pattern.compile(pattern);
+ * Pattern p = Pattern.compile(pattern, Pattern.DOTALL);
* Matcher m = p.matcher(source);
* return m.matches();</pre>
* @param pattern the pattern to match against
@@ -45,8 +51,24 @@ public class RegExPatternMatcher implements PatternMatcher {
if (pattern == null) {
throw new IllegalArgumentException("pattern argument cannot be null.");
}
- Pattern p = Pattern.compile(pattern);
+ Pattern p = Pattern.compile(pattern, caseInsensitive ? CASE_INSENSITIVE : DEFAULT);
Matcher m = p.matcher(source);
return m.matches();
}
+
+ /**
+ * Returns true if regex match should be case-insensitive.
+ * @return true if regex match should be case-insensitive.
+ */
+ public boolean isCaseInsensitive() {
+ return caseInsensitive;
+ }
+
+ /**
+ * Adds the Pattern.CASE_INSENSITIVE flag when compiling patterns.
+ * @param caseInsensitive true if patterns should match case-insensitive.
+ */
+ public void setCaseInsensitive(boolean caseInsensitive) {
+ this.caseInsensitive = caseInsensitive;
+ }
}
diff --git a/core/src/test/java/org/apache/shiro/util/RegExPatternMatcherTest.java b/core/src/test/java/org/apache/shiro/util/RegExPatternMatcherTest.java
index 5246ba60..dc42368d 100644
--- a/core/src/test/java/org/apache/shiro/util/RegExPatternMatcherTest.java
+++ b/core/src/test/java/org/apache/shiro/util/RegExPatternMatcherTest.java
@@ -21,8 +21,6 @@ package org.apache.shiro.util;
import org.junit.Test;
import static org.junit.Assert.*;
-import java.util.regex.Pattern;
-
/**
* Unit tests for the {@link RegExPatternMatcher}.
*
@@ -32,12 +30,44 @@ public class RegExPatternMatcherTest {
@Test
public void testSimplePattern() {
- PatternMatcher pm = new RegExPatternMatcher();
- String pattern = "a*b";
- String test = "aaaaaaab";
- //not necessary for the test, but Idea performs auto validation when it sees this:
- Pattern.compile(pattern);
- assertTrue(pm.matches(pattern, test));
+ assertPatternMatch("a*b", "aaaaaaab");
+ }
+
+ @Test
+ public void testMatchesWithCarriageReturn() {
+ assertPatternMatch(".*", "/blah\n");
+ }
+
+ @Test
+ public void testMatchesWithLineFeed() {
+ assertPatternMatch(".*", "/blah\r");
+ }
+
+ @Test
+ public void testCaseInsensitive() {
+ RegExPatternMatcher pm = new RegExPatternMatcher();
+ pm.setCaseInsensitive(true);
+ assertPatternMatch("/blah", "/BlaH", pm);
}
+ @Test
+ public void testCaseSensitive() {
+ assertPatternNotMatch("/blah", "/BlaH");
+ }
+
+ private void assertPatternMatch(String pattern, String path) {
+ assertPatternMatch(pattern, path, new RegExPatternMatcher());
+ }
+
+ private void assertPatternMatch(String pattern, String path, PatternMatcher pm) {
+ assertTrue("Expected path '" + path + "' to match pattern '" + pattern + "'" , pm.matches(pattern, path));
+ }
+
+ private void assertPatternNotMatch(String pattern, String path) {
+ assertPatternNotMatch(pattern, path, new RegExPatternMatcher());
+ }
+
+ private void assertPatternNotMatch(String pattern, String path, PatternMatcher pm) {
+ assertFalse("Expected path '" + path + "' to NOT match pattern '" + pattern + "'" , pm.matches(pattern, path));
+ }
}