diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 60dd3f90..ced2975e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ jobs: run: mvn --batch-mode --update-snapshots package - name: Locally install filter - run: mvn install --batch-mode + run: mvn install --batch-mode -Dgpg.skip - name: Locally install example working-directory: container-test/example-webapp diff --git a/README.md b/README.md index da9a82d8..fd35744c 100644 --- a/README.md +++ b/README.md @@ -23,22 +23,21 @@ See the [manual](https://tuckey.org/urlrewrite/manual/4.0/index.html) for more i ## Quick Start - * Add Maven dependency below or add urlrewritefilter-4.0.3.jar directly into your WEB-INF/lib directory. + * Add Maven dependency below or add urlrewritefilter-5.1.2.jar directly into your WEB-INF/lib directory. ```xml org.tuckey urlrewritefilter - 4.0.3 + 5.1.2 ``` -For Servlet API 5.0, use Jakarta classifier like +For Servlet API 4 or less (javax), use the old version 4.x ```xml org.tuckey urlrewritefilter 4.0.3 - jakarta ``` * Add the following to your WEB-INF/web.xml (add it near the top above your servlet mappings (if you have any)): (see filter parameters for more options) diff --git a/annotation/pom.xml b/annotation/pom.xml index f4305310..330e31e8 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -12,15 +12,9 @@ Add-on to urlrewritefilter to support annotations - - - UrlRewrite users - urlrewrite@googlegroups.com - urlrewrite+subscribe@googlegroups.com - urlrewrite+unsubscribe@googlegroups.com - https://groups.google.com/d/forum/urlrewrite - - + + UTF-8 + diff --git a/container-test/example-webapp/pom.xml b/container-test/example-webapp/pom.xml index c74e2ab7..a10d846d 100644 --- a/container-test/example-webapp/pom.xml +++ b/container-test/example-webapp/pom.xml @@ -58,7 +58,7 @@ org.tuckey urlrewritefilter - 5.1.1 + 5.1.2 jakarta.servlet diff --git a/container-test/test-with-testcontainers/pom.xml b/container-test/test-with-testcontainers/pom.xml index 1e8402e8..fd54656c 100644 --- a/container-test/test-with-testcontainers/pom.xml +++ b/container-test/test-with-testcontainers/pom.xml @@ -7,6 +7,7 @@ 17 17 + UTF-8 1.0.0 UrlRewriteFilter Container Tests @@ -46,7 +47,7 @@ org.tuckey urlrewritefilter - 5.1.1 + 5.1.2 diff --git a/pom.xml b/pom.xml index be9b9d7a..f666562a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tuckey urlrewritefilter jar - 5.1.1 + 5.1.2 UrlRewriteFilter http://www.tuckey.org/urlrewrite/ 2001 @@ -27,6 +27,7 @@ 5.0 2022 UTF-8 + UTF-8 diff --git a/src/doc/manual/5.0/index.html b/src/doc/manual/5.0/index.html index f6e8a402..5468bd49 100644 --- a/src/doc/manual/5.0/index.html +++ b/src/doc/manual/5.0/index.html @@ -86,12 +86,12 @@

Install

  1. Add Maven dependency below or add - urlrewritefilter-5.0.0.jar + urlrewritefilter-5.1.2.jar directly into your WEB-INF/lib directory. 
    <dependency>
     <groupId>org.tuckey</groupId>
     <artifactId>urlrewritefilter</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.2</version>
 </dependency>
  2. Add the following to your WEB-INF/web.xml (add it near the top above your servlet mappings (if you have any)): (see filter @@ -106,7 +106,7 @@

    Install

    <dispatcher>REQUEST</dispatcher> <dispatcher>FORWARD</dispatcher> </filter-mapping>
    3. -
  3. Add urlrewrite.xml +
  4. Add urlrewrite.xml into your WEB-INF directory. (src/main/webapp/WEB-INF/ for Maven users)
  5. Restart the context.
@@ -255,7 +255,7 @@

Configuration File WEB-INF/urlrewrite.xml

Configuration is done via a simple XML file that lives in your WEB-INF folder. It should be named urlrewrite.xml. - It may be helpful to read the UrlRewriteFilter DTD + It may be helpful to read the UrlRewriteFilter DTD (Document Type Definition). Please also make sure you look at the examples. A simple configuration file looks like:

diff --git a/src/doc/manual/5.0/introduction.html b/src/doc/manual/5.0/introduction.html index 77c6d147..16822954 100644 --- a/src/doc/manual/5.0/introduction.html +++ b/src/doc/manual/5.0/introduction.html @@ -188,6 +188,17 @@

License

Changelog

    +
  • 5.1.2 +
      +
    • Fix: Add v5 DTD
      • +
    • Docs: Add 5 references for readme and docs
      • +
    +
    • +
  • 5.1.1 +
      +
    • Changed to be fully based on jakarta servlet API 5
      • +
    +
  • 5.0.0
    • Removed Annotation processor
      • diff --git a/src/doc/manual/5.0/urlrewrite-conf-overview-sample.html b/src/doc/manual/5.0/urlrewrite-conf-overview-sample.html index 62f1ca6f..37736174 100644 --- a/src/doc/manual/5.0/urlrewrite-conf-overview-sample.html +++ b/src/doc/manual/5.0/urlrewrite-conf-overview-sample.html @@ -51,7 +51,7 @@ } -

      UrlRewriteFilter 5.0.0-SNAPSHOT build 0d262f7db8cf16b93623a16961666e3ac904a7de configuration overview (generated 1/12/17 12:18 PM)

      +

      UrlRewriteFilter 5.1.2 build 0d262f7db8cf16b93623a16961666e3ac904a7de configuration overview (generated 1/10/23 12:18 PM)

      Summary of urlrewrite.xml diff --git a/src/doc/manual/5.0/urlrewrite.xml b/src/doc/manual/5.0/urlrewrite.xml index a5f596c4..6140db6f 100644 --- a/src/doc/manual/5.0/urlrewrite.xml +++ b/src/doc/manual/5.0/urlrewrite.xml @@ -1,6 +1,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/webapp/WEB-INF/urlrewrite.xml b/src/test/webapp/WEB-INF/urlrewrite.xml index a1d27c89..3a132963 100644 --- a/src/test/webapp/WEB-INF/urlrewrite.xml +++ b/src/test/webapp/WEB-INF/urlrewrite.xml @@ -1,6 +1,6 @@ - +