From 8c7be5f63734220498d88700d92a358290c76c21 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 6 Mar 2018 15:27:26 -0500 Subject: [PATCH 01/68] Use current ocpsoft parent to allow releasing --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3100c19ad..a0ef93b1a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.ocpsoft ocpsoft-parent - 14 + 15 From ae8df0d1070e6e04362d0e09535dc6d98acfd5a8 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 6 Mar 2018 15:32:08 -0500 Subject: [PATCH 02/68] [maven-release-plugin] prepare release 3.4.2.Final --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 6246b71f6..8e57b1b7f 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 61706a0b4..a750864a2 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index 359a6bb4f..c19761507 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 8d0fca03b..70f5a5ccc 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index 6dbde36d9..20fd0cfe6 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 059b38bf3..ed75adadb 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/api/pom.xml b/api/pom.xml index d70bfecaf..79064d391 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index c0a78f781..7dc5b5689 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index f79ab2d61..c8515bade 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 2a8ac35dc..8d3064340 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index b9c38077e..312bdb673 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 01bab2aef..28b310882 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index 5effb6892..f5ed97c3e 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 0bb22c622..c5af6eac2 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 586f5addc..96b60972f 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index ab5724484..8c76100ae 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index a04039b8a..09cd4246f 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/examples/pom.xml b/examples/pom.xml index 2e1251b6b..2c24829ff 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index a99b26ecf..b005c858a 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 8ebee627f..1f76fbc82 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 6db606ce5..7bbb26b6a 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index ddc034039..f7caafb04 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index b78021834..e13b2f254 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/impl/pom.xml b/impl/pom.xml index a7fecfdef..9f162c8dd 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index fff0194f0..66562842e 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index b80026e49..1aa610f0d 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index 91c8b343b..b728d2eeb 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index f7ac8decc..ed2545a92 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index b333d9da2..fe7e8bd69 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index cd012f97d..5fe553a1a 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/pom.xml b/pom.xml index a0ef93b1a..cd836873d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final pom @@ -857,7 +857,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - HEAD + 3.4.2.Final diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index f88619cc5..f88b8257b 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 089405a23..e1c4ece48 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index bdc7315b9..863549f90 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 96f60a199..8eea03044 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 3f9c93bc3..669e8447e 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 31adeff5b..8a7440547 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 83b7bfe1b..c7bb9636e 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 923aa4178..bffff0475 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 1d3e8d3fc..866fa7bb8 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 699f19e06..c69c4f48c 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 9933163ce..dbc35e66b 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index f86dfbcf1..b0afcf0f3 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 868245e9a..4b2e03f5d 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ diff --git a/transform/pom.xml b/transform/pom.xml index bab5a8c6c..9a9112d42 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2-SNAPSHOT + 3.4.2.Final ../ From ec3e9d6be0f562b26ad861ba0cfafea3602a98f9 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 6 Mar 2018 15:32:09 -0500 Subject: [PATCH 03/68] [maven-release-plugin] prepare for next development iteration --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 8e57b1b7f..949f84cbf 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index a750864a2..9e0b6ca5c 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index c19761507..5f32888ae 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 70f5a5ccc..d7f44ca78 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index 20fd0cfe6..b2af039f6 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index ed75adadb..8957884f1 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/api/pom.xml b/api/pom.xml index 79064d391..ea58c69fc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 7dc5b5689..d33b60687 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index c8515bade..32b0a3bf1 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 8d3064340..13795a94d 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 312bdb673..048a8f13a 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 28b310882..2fd0223e0 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index f5ed97c3e..c1f179b19 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index c5af6eac2..1af153da7 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 96b60972f..8f35125ba 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index 8c76100ae..dbe529195 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index 09cd4246f..1c1c19649 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/examples/pom.xml b/examples/pom.xml index 2c24829ff..1db19e36c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index b005c858a..15e00a41d 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 1f76fbc82..5243dee97 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 7bbb26b6a..4946c838a 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index f7caafb04..9fbf74637 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index e13b2f254..ba8bce80e 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/impl/pom.xml b/impl/pom.xml index 9f162c8dd..fb4da46ba 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index 66562842e..69a5d4f99 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 1aa610f0d..103e42030 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index b728d2eeb..530ddb170 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index ed2545a92..3ffb1cccb 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index fe7e8bd69..908aaf78e 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 5fe553a1a..dff2043d9 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index cd836873d..007582116 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT pom @@ -857,7 +857,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - 3.4.2.Final + HEAD diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index f88b8257b..84021b26c 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index e1c4ece48..e101c44f3 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 863549f90..9657d8372 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 8eea03044..dcf4e1cc3 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 669e8447e..f9fe4e15d 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 8a7440547..674334442 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index c7bb9636e..1523be2c0 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index bffff0475..0e22545b9 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 866fa7bb8..7a82b1e56 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index c69c4f48c..bb659168b 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index dbc35e66b..81d000a64 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index b0afcf0f3..9e679123a 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 4b2e03f5d..801949e4a 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ diff --git a/transform/pom.xml b/transform/pom.xml index 9a9112d42..7013f5fbd 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.2.Final + 3.4.3-SNAPSHOT ../ From 0f43e9684af7c5b94f39d49414543ed167619232 Mon Sep 17 00:00:00 2001 From: balta3 Date: Mon, 19 Mar 2018 16:02:36 +0100 Subject: [PATCH 04/68] skip versioned classes in Java 9 Multi-release JAR files (#262) --- .../ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java index 9bc6e8913..a27850501 100644 --- a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java +++ b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java @@ -123,6 +123,11 @@ protected static String getClassName(String filename) protected boolean mustProcessClass(String className) { + // skip versioned classes in Java 9 Multi-release JAR files + if (className.startsWith("META-INF.versions")) { + return false; + } + // the default package String packageName = ""; From af2b6547bbf0401f078fda6c855a6bd9879890ae Mon Sep 17 00:00:00 2001 From: Xavier Dury Date: Fri, 24 Aug 2018 17:07:08 +0200 Subject: [PATCH 05/68] Add a parameter to disable WEB-INF/classes scanning (#267) --- .../config/AnnotationConfigProvider.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/config/AnnotationConfigProvider.java b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/config/AnnotationConfigProvider.java index b4f3e7341..247ffbce6 100644 --- a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/config/AnnotationConfigProvider.java +++ b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/config/AnnotationConfigProvider.java @@ -40,6 +40,7 @@ public class AnnotationConfigProvider extends HttpConfigurationProvider { private final Logger log = Logger.getLogger(AnnotationConfigProvider.class); + public static final String CONFIG_SCAN_CLASSES_DIR = "org.ocpsoft.rewrite.annotation.SCAN_CLASSES_DIRECTORY"; public static final String CONFIG_SCAN_LIB_DIR = "org.ocpsoft.rewrite.annotation.SCAN_LIB_DIRECTORY"; public static final String CONFIG_BASE_PACKAGES = "org.ocpsoft.rewrite.annotation.BASE_PACKAGES"; @@ -61,10 +62,18 @@ public Configuration getConfiguration(ServletContext servletContext) // retrieve the optional package filter configuration parameter String packageFilters = servletContext.getInitParameter(CONFIG_BASE_PACKAGES); + // does the user not want to scan the WEB-INF/classes directory + boolean scanClassesDir = true; + String classesConfig = servletContext.getInitParameter(CONFIG_SCAN_CLASSES_DIR); + if ((classesConfig != null) && classesConfig.trim().equalsIgnoreCase("false")) + { + scanClassesDir = false; + } + // does the user want to scan the WEB-INF/lib directory boolean scanLibDir = false; - String jarConfig = servletContext.getInitParameter(CONFIG_SCAN_LIB_DIR); - if ((jarConfig != null) && jarConfig.trim().equalsIgnoreCase("true")) + String libConfig = servletContext.getInitParameter(CONFIG_SCAN_LIB_DIR); + if ((libConfig != null) && libConfig.trim().equalsIgnoreCase("true")) { scanLibDir = true; } @@ -121,7 +130,10 @@ public Configuration getConfiguration(ServletContext servletContext) // TODO this should be pulled out into a utility allowing it to run in Java SE // compile a list of class finders to run List classFinders = new ArrayList(); - classFinders.add(new WebClassesFinder(servletContext, classloader, packageFilter, byteCodeFilter)); + if (scanClassesDir) + { + classFinders.add(new WebClassesFinder(servletContext, classloader, packageFilter, byteCodeFilter)); + } if (scanLibDir) { classFinders.add(new WebLibFinder(servletContext, classloader, packageFilter, byteCodeFilter)); From b9882970a847898f62cc31898568e484a2c8b96b Mon Sep 17 00:00:00 2001 From: mdfst13 <43025590+mdfst13@users.noreply.github.com> Date: Wed, 12 Sep 2018 00:19:00 -0400 Subject: [PATCH 06/68] Various improvements and code cleanup --- .travis.yml | 2 +- .../servlet/util/QueryStringBuilderTest.java | 6 ++++++ .../rewrite/servlet/util/URLBuilderTest.java | 6 ++++++ .../ocpsoft/rewrite/test/MockServletRewrite.java | 2 -- .../transposition/LocaleTranspositionTest.java | 2 +- .../annotation/handler/ParameterHandler.java | 4 ---- .../faces/servlet/PrettyFacesWrappedRequest.java | 3 ++- .../faces/servlet/PrettyFacesWrappedResponse.java | 14 ++++++++++---- .../ocpsoft/pretty/faces/util/StringUtils.java | 15 +++++++++++++++ .../pretty/faces/config/MockClassLoader.java | 2 +- .../servlet/config/CDNConfigurationTest.java | 1 + .../faces/outbound/OutboundResourceTest.java | 2 -- 12 files changed, 43 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97f5b5752..47aea5631 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: - env: CONTAINER=GLASSFISH_MANAGED_3.1 jdk: openjdk7 - env: CONTAINER=GLASSFISH_MANAGED_4.0 - jdk: oraclejdk7 + jdk: oraclejdk8 - env: CONTAINER=TOMEE_MANAGED_1.5 jdk: openjdk7 notifications: diff --git a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java index a7932e2b0..b598fa600 100644 --- a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java +++ b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java @@ -28,6 +28,12 @@ import org.junit.Test; +/* + * FIXME: Remove references to deprecated code. + * Leaving test class while the code is still usable. + * Adding task as a better method of tracking. + */ +@Deprecated public class QueryStringBuilderTest { @Test diff --git a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java index 4cf5592c0..bbc16ee29 100644 --- a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java +++ b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/URLBuilderTest.java @@ -22,6 +22,12 @@ import org.junit.Test; +/* + * FIXME: Remove references to deprecated code. + * Leaving test class while the code is still usable. + * Adding task as a better method of tracking. + */ +@Deprecated public class URLBuilderTest { @Test(expected = IllegalArgumentException.class) diff --git a/api-tests/src/test/java/org/ocpsoft/rewrite/test/MockServletRewrite.java b/api-tests/src/test/java/org/ocpsoft/rewrite/test/MockServletRewrite.java index 550d30bfe..60caee623 100644 --- a/api-tests/src/test/java/org/ocpsoft/rewrite/test/MockServletRewrite.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/test/MockServletRewrite.java @@ -20,9 +20,7 @@ import javax.servlet.ServletResponse; import org.ocpsoft.rewrite.AbstractRewrite; -import org.ocpsoft.rewrite.context.Context; import org.ocpsoft.rewrite.event.Flow; -import org.ocpsoft.rewrite.mock.MockRewriteContext; import org.ocpsoft.rewrite.servlet.event.BaseRewrite.ServletRewriteFlow; import org.ocpsoft.rewrite.servlet.event.ServletRewrite; diff --git a/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java index 15fed9a85..ee33bf2d7 100644 --- a/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java @@ -86,7 +86,7 @@ public void testI18nSupportOutbound() throws Exception { HttpAction action = get("/en/search.xhtml"); Assert.assertEquals(200, action.getResponse().getStatusLine().getStatusCode()); - Assert.assertThat(action.getResponseContent(), org.junit.matchers.JUnitMatchers.containsString("/en/search")); + Assert.assertThat(action.getResponseContent(), org.hamcrest.CoreMatchers.containsString("/en/search")); } /** diff --git a/config-annotations/src/main/java/org/ocpsoft/rewrite/annotation/handler/ParameterHandler.java b/config-annotations/src/main/java/org/ocpsoft/rewrite/annotation/handler/ParameterHandler.java index 0da13ddc6..091ccdac0 100644 --- a/config-annotations/src/main/java/org/ocpsoft/rewrite/annotation/handler/ParameterHandler.java +++ b/config-annotations/src/main/java/org/ocpsoft/rewrite/annotation/handler/ParameterHandler.java @@ -23,10 +23,6 @@ import org.ocpsoft.rewrite.annotation.api.HandlerChain; import org.ocpsoft.rewrite.annotation.spi.FieldAnnotationHandler; import org.ocpsoft.rewrite.bind.Binding; -import org.ocpsoft.rewrite.config.Condition; -import org.ocpsoft.rewrite.config.ConditionBuilder; -import org.ocpsoft.rewrite.config.Or; -import org.ocpsoft.rewrite.config.True; import org.ocpsoft.rewrite.el.El; import org.ocpsoft.rewrite.param.ConfigurableParameter; import org.ocpsoft.rewrite.param.Parameter; diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedRequest.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedRequest.java index 70cacea9e..ffc89fc33 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedRequest.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedRequest.java @@ -57,10 +57,11 @@ public String getParameter(final String name) return null; } + @SuppressWarnings("unchecked") @Override public Map getParameterMap() { - Map allParameters = new TreeMap(); + Map allParameters = new TreeMap<>(); allParameters.putAll(super.getParameterMap()); allParameters.putAll(modifiableParameters); return Collections.unmodifiableMap(allParameters); diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java index 24822a962..2e9045fbf 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java @@ -63,11 +63,14 @@ public PrettyFacesWrappedResponse(final String contextPath, final HttpServletReq this.prettyConfig = config; } + // they changed the API to use URL instead of Url + // someday they will remove it and this can be removed + // in the meantime, mark as deprecated so people don't use it + @Deprecated @Override - @SuppressWarnings("deprecation") public String encodeRedirectUrl(final String url) { - return super.encodeRedirectUrl(url); + return super.encodeRedirectURL(url); } @Override @@ -76,11 +79,14 @@ public String encodeRedirectURL(final String url) return super.encodeRedirectURL(url); } + // they changed the API to use URL instead of Url + // someday they will remove it and this can be removed + // in the meantime, mark as deprecated so people don't use it + @Deprecated @Override - @SuppressWarnings("deprecation") public String encodeUrl(final String url) { - return super.encodeUrl(url); + return super.encodeURL(url); } @Override diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/util/StringUtils.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/util/StringUtils.java index 436430ab3..73ebcccc1 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/util/StringUtils.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/util/StringUtils.java @@ -78,4 +78,19 @@ public static int countSlashes(final String s) return result; } + public static String removePathPrefix(String prefix, String url) + { + // if the remaining path does not start with a / + // then don't remove the context path + // this handles context paths like / or /context/ that remove too much + // or URLs like /contextPathPlus that don't actually match /contextPath + // this also addresses https://github.com/ocpsoft/rewrite/issues/180 + if (url.charAt(prefix.length()) == '/' && url.startsWith(prefix)) + { + url = url.substring(prefix.length()); + } + + return url; + } + } diff --git a/config-prettyfaces/src/test/java/com/ocpsoft/pretty/faces/config/MockClassLoader.java b/config-prettyfaces/src/test/java/com/ocpsoft/pretty/faces/config/MockClassLoader.java index 232437057..c5017d277 100644 --- a/config-prettyfaces/src/test/java/com/ocpsoft/pretty/faces/config/MockClassLoader.java +++ b/config-prettyfaces/src/test/java/com/ocpsoft/pretty/faces/config/MockClassLoader.java @@ -51,7 +51,7 @@ public Enumeration getResources(final String name) throws IOException } } - private Enumeration enumeration(final T... elements) + private Enumeration enumeration(@SuppressWarnings("unchecked") final T... elements) { return new Enumeration() { diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/CDNConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/CDNConfigurationTest.java index 2f5cbee7d..d2b08fe25 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/CDNConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/CDNConfigurationTest.java @@ -28,6 +28,7 @@ import org.ocpsoft.rewrite.config.ConfigurationProvider; import org.ocpsoft.rewrite.test.HttpAction; import org.ocpsoft.rewrite.test.RewriteTest; +import org.ocpsoft.rewrite.servlet.config.ConfigRoot; /** * @author Lincoln Baxter, III diff --git a/integration-faces-tests/src/test/java/org/ocpsoft/rewrite/faces/outbound/OutboundResourceTest.java b/integration-faces-tests/src/test/java/org/ocpsoft/rewrite/faces/outbound/OutboundResourceTest.java index be3626393..cd24eea96 100644 --- a/integration-faces-tests/src/test/java/org/ocpsoft/rewrite/faces/outbound/OutboundResourceTest.java +++ b/integration-faces-tests/src/test/java/org/ocpsoft/rewrite/faces/outbound/OutboundResourceTest.java @@ -16,9 +16,7 @@ package org.ocpsoft.rewrite.faces.outbound; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import org.hamcrest.Matchers; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; From e140b5b65a37c87250fcc2eecf4354a1f6c562c5 Mon Sep 17 00:00:00 2001 From: mdfst13 Date: Wed, 12 Sep 2018 07:20:13 -0400 Subject: [PATCH 07/68] Fix typos in documentation. --- .../src/main/asciidoc/configuration/index.asciidoc | 6 +++--- documentation/src/main/asciidoc/faq.asciidoc | 4 ++-- .../src/main/asciidoc/migration/prettyfaces3.asciidoc | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/src/main/asciidoc/configuration/index.asciidoc b/documentation/src/main/asciidoc/configuration/index.asciidoc index 4cc262297..b035f9dfe 100644 --- a/documentation/src/main/asciidoc/configuration/index.asciidoc +++ b/documentation/src/main/asciidoc/configuration/index.asciidoc @@ -16,11 +16,11 @@ ConfigurationProvider:: An object that provides +Configuration+ instances to the Configuration:: A collection of +Rule+ objects that are processed in order until the system has determined the current inbound or oubound Rewrite event has been handled. Configurations may be provided by extensions, cached for performance, or built dynamically at run-time. -ConfigurationBuilder:: This is likely the object you will interact with most when configuring the Rewrite system. Start with a +ConfigurationBuilder+ in each situation where you find yourself in need of a +Configuration+ object; this class may be used to add pre-constructed, or contruct custom +Rule+ instances for Rewrite. +ConfigurationBuilder:: This is likely the object you will interact with most when configuring the Rewrite system. Start with a +ConfigurationBuilder+ in each situation where you find yourself in need of a +Configuration+ object; this class may be used to add pre-constructed, or construct custom +Rule+ instances for Rewrite. Condition:: Defines a requirement that must be met in order for rule evaluation to return true. You may create custom +Condition+ implementations. If creating custom implementations, you should likely extend +DefaultConditionBuilder+, which adds logical operators +.and()+, +.or()+, and +.not()+. -Operation:: Defines behavior to be performed after evaluation a +Rewrite+ event. These objects may be as simple or as complex as desired, ranging from simple logging to request forwarding. Typically +Operation+ instances may be chained to achieve more complex tasks. If creating custom umplementations, you should likely extend +DefaultOperationBuilder+, which adds logical chaining via +.and()+. +Operation:: Defines behavior to be performed after evaluation a +Rewrite+ event. These objects may be as simple or as complex as desired, ranging from simple logging to request forwarding. Typically +Operation+ instances may be chained to achieve more complex tasks. If creating custom implementations, you should likely extend +DefaultOperationBuilder+, which adds logical chaining via +.and()+. Parameter:: Specifies a fragment of an HTTP request that may be referenced in both +Condition+ and +Operation+ instances. Parameters are defined using the +.where()+ method of the +ConfigurationBuilder+, which is available once the first +Rule+ (with conditions or operations) has been added. @@ -91,7 +91,7 @@ java.lang.IllegalArgumentException: No such parameter [ foo ] exists. ==== A closer look -Now that we have written a rule that uses a few different +Operation+ and +Condition+ objects, lets take a look at how the interaction works - we will break down the entire rule: +Now that we have written a rule that uses a few different +Operation+ and +Condition+ objects, let's take a look at how the interaction works - we will break down the entire rule: [source,java] ---- diff --git a/documentation/src/main/asciidoc/faq.asciidoc b/documentation/src/main/asciidoc/faq.asciidoc index 2520a8ab6..eeeea688c 100644 --- a/documentation/src/main/asciidoc/faq.asciidoc +++ b/documentation/src/main/asciidoc/faq.asciidoc @@ -35,8 +35,8 @@ According to the Servlet spec +HttpServletRequest.getParameter*()+ and for +multipart/form-data+ request. Using these methods outside of such Servlets results in undefined behavior. -Apache Tomcat provides an configuration parameter which changes this and -allows to access these methods from a Servlet filter. To enable this +Apache Tomcat provides a configuration parameter which changes this and +allows access to these methods from a Servlet filter. To enable this behavior, create a file +META-INF/context.xml+ in your WAR file (in case of Maven use +src/main/webapp/META-INF/context.xml+) and add the following content: diff --git a/documentation/src/main/asciidoc/migration/prettyfaces3.asciidoc b/documentation/src/main/asciidoc/migration/prettyfaces3.asciidoc index 4811ad47e..083e4caa5 100644 --- a/documentation/src/main/asciidoc/migration/prettyfaces3.asciidoc +++ b/documentation/src/main/asciidoc/migration/prettyfaces3.asciidoc @@ -116,7 +116,7 @@ Remove this entry completely and replace it with the corresponding entry for the ---- -NOTE: Please not that if you are using a Servlet 3.x container and your +web.xml+ doesn't set +NOTE: Please note that if you are using a Servlet 3.x container and your +web.xml+ doesn't set +metadata-complete="true"+, you don't have to register the Rewrite filter manually, because this is done automatically. In this case just make sure to remove the old +PrettyFilter+ entry. @@ -277,7 +277,7 @@ code for an example: ).where("category").bindsTo(El.property("bean.category")) |=== -If your bean uses a JSF-specifc scope like +@ViewScoped+), you have to wrap +If your bean uses a JSF-specific scope like +@ViewScoped+), you have to wrap the +El+ binding in a +PhaseBinding+. This will tell PrettyFaces to submit the binding in the specified JSF phase which ensures, that the scope of the bean will be active. @@ -531,7 +531,7 @@ public void action() { } |=== -TIP: Thie +@IgnorePostback+ annotation can also be used with +@Parameter+. +TIP: The +@IgnorePostback+ annotation can also be used with +@Parameter+. If the annotated bean has a scope that requires an active JSF lifecycle like for example +@ViewScope+, you have to _defer_ the invocation so that it is executed within the JSF lifecycle. @@ -575,7 +575,7 @@ public class CustomerDetailsBean { PrettyFaces shipped with a special JSF component that simplified creating links to mapped URLs. However JSF 2.0 introduced ++, which works fine for creating such links. Rewrite doesn't -include any special JSF component. It is recomended to use the standard JSF component for rendering +include any special JSF component. It is recommended to use the standard JSF component for rendering links. Using ++ for creating links to Rewrite URLs is very easy. Just use the URL you From e54a055e34664ddfbed8487b8288711cd2b50c6b Mon Sep 17 00:00:00 2001 From: mdfst13 <43025590+mdfst13@users.noreply.github.com> Date: Wed, 12 Sep 2018 11:17:10 -0400 Subject: [PATCH 08/68] Mark TOMEE as an allowable failure Currently, TOMEE_MANAGED_1.5 fails on every build, presumably due to configuration issues. This change marks that as allowable, so if the other four builds succeed, it will show green rather than red as it does now. The TOMEE build will still show red on the details screen, but the summary view on GitHub will show green. This way, if someone fixes TOMEE, it will be visible in Travis. But this way, red means failed rather than "check if anything other than TOMEE failed." A typical build with all successes except a TOMEE failure will show as green. At least that's what https://docs.travis-ci.com/user/customizing-the-build#rows-that-are-allowed-to-fail says. I can't test without committing and requesting a pull. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 47aea5631..36a4762d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ matrix: jdk: oraclejdk8 - env: CONTAINER=TOMEE_MANAGED_1.5 jdk: openjdk7 + allow_failures: + - env: CONTAINER=TOMEE_MANAGED_1.5 notifications: email: - "ocpsoft-ci@googlegroups.com" From 7ae9688f55088e7f8a90262dfabcd80d3e283700 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Tue, 18 Sep 2018 18:19:19 -0400 Subject: [PATCH 09/68] Fix Ref identifier A Ref has a refid, which indicates the element to which it is referring. Unlike id attributes, refid does not need to be unique per document. --- test-harness/src/main/resources/jetty-env.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-harness/src/main/resources/jetty-env.xml b/test-harness/src/main/resources/jetty-env.xml index 6bd144e0c..58d6efc2e 100644 --- a/test-harness/src/main/resources/jetty-env.xml +++ b/test-harness/src/main/resources/jetty-env.xml @@ -5,7 +5,7 @@ false - + type Embedded true @@ -17,7 +17,7 @@ - + BeanManager From e4f360cb869898752bed962b0cc8274528828832 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Wed, 19 Sep 2018 17:45:10 -0400 Subject: [PATCH 10/68] Remove deprecated code 1. Use generics rather than an uncheckable Enumeration cast. 2. Remove reference to deprecated AbortableHttpRequest. Its replacement, HttpExecutionAware does not require this kind of handling. 3. Move deprecated use of setStatus to its own method for ease of marking with @SuppressWarnings. 4. Remove readConfigParam, as it does not do anything. It does not read HANDLE_REDIRECTS from anywhere, so it is always left as the default. 5. Switch from deprecated DefaultHttpClient to CloseableHttpClient. 6. CloseableHttpClient closes any underlying resources for you. It does not need manually handled. 7. This implicitly removes ThreadSafeClientConnManager in favor of HttpClientConnectionManager, which is thread safe. 8. Mark serialVersionUID as unused. In the future, it may be removed as unnecessary. --- .../servlet/config/proxy/ProxyServlet.java | 94 ++++++------------- 1 file changed, 29 insertions(+), 65 deletions(-) diff --git a/config-proxy/src/main/java/org/ocpsoft/rewrite/servlet/config/proxy/ProxyServlet.java b/config-proxy/src/main/java/org/ocpsoft/rewrite/servlet/config/proxy/ProxyServlet.java index 106ef9f27..be32b0166 100644 --- a/config-proxy/src/main/java/org/ocpsoft/rewrite/servlet/config/proxy/ProxyServlet.java +++ b/config-proxy/src/main/java/org/ocpsoft/rewrite/servlet/config/proxy/ProxyServlet.java @@ -36,19 +36,14 @@ import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.AbortableHttpRequest; -import org.apache.http.client.params.ClientPNames; import org.apache.http.client.utils.URIUtils; import org.apache.http.entity.InputStreamEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.message.HeaderGroup; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpParams; import org.apache.http.util.EntityUtils; import org.ocpsoft.logging.Logger; @@ -70,6 +65,9 @@ public class ProxyServlet { /* INIT PARAMETER NAME CONSTANTS */ + // FIXME: determine if this should be serializable + // if so, implement interface; if not, remove serialVersionUID + @SuppressWarnings("unused") private static final long serialVersionUID = -362164247914670579L; /** @@ -87,7 +85,7 @@ public class ProxyServlet protected boolean doLog = false; protected URI targetUriObj; protected String targetUri; - protected HttpClient proxyClient; + protected CloseableHttpClient proxyClient; private ServletConfig servletConfig; @@ -117,53 +115,19 @@ public void init(ServletConfig servletConfig) throws ServletException } targetUri = targetUriObj.toString(); - HttpParams hcParams = new BasicHttpParams(); - readConfigParam(hcParams, ClientPNames.HANDLE_REDIRECTS, Boolean.class); - proxyClient = createHttpClient(hcParams); + proxyClient = HttpClientBuilder.create().build(); } - /** - * Called from {@link #init(javax.servlet.ServletConfig)}. HttpClient offers many opportunities for customization. - */ - protected HttpClient createHttpClient(HttpParams hcParams) - { - return new DefaultHttpClient(new ThreadSafeClientConnManager(), hcParams); - } - - protected void readConfigParam(HttpParams hcParams, String hcParamName, Class type) + public void destroy() { - String val_str = getServletConfig().getInitParameter(hcParamName); - if (val_str == null) - return; - Object val_obj; - if (type == String.class) + try { - val_obj = val_str; + if (proxyClient != null) proxyClient.close(); } - else + catch (IOException e) { - try - { - /* - * noinspection unchecked - */ - val_obj = type.getMethod("valueOf", String.class).invoke(type, val_str); - } - catch (Exception e) - { - throw new RuntimeException(e); - } + logger.error("The proxyClient threw an exception on closing.", e); } - hcParams.setParameter(hcParamName, val_obj); - } - - public void destroy() - { - /* - * shutdown() must be called according to documentation. - */ - if (proxyClient != null) - proxyClient.getConnectionManager().shutdown(); } protected void service(HttpServletRequest servletRequest, HttpServletResponse servletResponse) @@ -220,11 +184,7 @@ protected void service(HttpServletRequest servletRequest, HttpServletResponse se return; } - /* - * Pass the response code. This method with the "reason phrase" is deprecated but it's the only way to pass the - * reason along too. noinspection deprecation - */ - servletResponse.setStatus(statusCode, proxyResponse.getStatusLine().getReasonPhrase()); + setResponseStatus(servletResponse, statusCode, proxyResponse.getStatusLine().getReasonPhrase()); copyResponseHeaders(proxyResponse, servletResponse); @@ -236,14 +196,6 @@ protected void service(HttpServletRequest servletRequest, HttpServletResponse se } catch (Exception e) { - /* - * abort request, according to best practice with HttpClient - */ - if (proxyRequest instanceof AbortableHttpRequest) - { - AbortableHttpRequest abortableHttpRequest = (AbortableHttpRequest) proxyRequest; - abortableHttpRequest.abort(); - } if (e instanceof RuntimeException) throw (RuntimeException) e; if (e instanceof ServletException) @@ -255,6 +207,15 @@ protected void service(HttpServletRequest servletRequest, HttpServletResponse se } } + @SuppressWarnings("deprecation") + private void setResponseStatus(HttpServletResponse servletResponse, int statusCode, String reason) { + /* + * Pass the response code. This method with the "reason phrase" is deprecated but it's the only way to pass the + * reason along too. noinspection deprecation + */ + servletResponse.setStatus(statusCode, reason); + } + protected boolean doResponseRedirectOrNotModifiedLogic( HttpServletRequest servletRequest, HttpServletResponse servletResponse, HttpResponse proxyResponse, int statusCode) @@ -281,6 +242,7 @@ protected boolean doResponseRedirectOrNotModifiedLogic( servletResponse.sendRedirect(locStr); return true; } + /* * 304 needs special handling. See: http://www.ics.uci.edu/pub/ietf/http/rfc1945.html#Code304 . We get a 304 * whenever passed an 'If-Modified-Since' header and the data on disk has not changed; server responds w/ a 304 @@ -331,23 +293,23 @@ protected void copyRequestHeaders(HttpServletRequest servletRequest, HttpRequest /* * Get an Enumeration of all of the header names sent by the client */ - Enumeration enumerationOfHeaderNames = servletRequest.getHeaderNames(); + Enumeration enumerationOfHeaderNames = servletRequest.getHeaderNames(); while (enumerationOfHeaderNames.hasMoreElements()) { - String headerName = enumerationOfHeaderNames.nextElement(); + String headerName = (String) enumerationOfHeaderNames.nextElement(); // Instead the content-length is effectively set via InputStreamEntity if (headerName.equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH)) continue; if (hopByHopHeaders.containsHeader(headerName)) continue; - Enumeration headers = servletRequest.getHeaders(headerName); + Enumeration headers = servletRequest.getHeaders(headerName); while (headers.hasMoreElements()) { /* * sometimes more than one value */ - String headerValue = headers.nextElement(); + String headerValue = (String) headers.nextElement(); /* * In case the proxy host is running multiple virtual servers, rewrite the Host header to ensure that we get * content from the correct virtual server @@ -457,6 +419,7 @@ else if (!Character.isISOControl(c) && !Character.isSpaceChar(c)) */ escape = false; } + if (!escape) { if (outBuf != null) @@ -479,6 +442,7 @@ else if (!Character.isISOControl(c) && !Character.isSpaceChar(c)) formatter.format("%%%02X", (int) c);// TODO } } + return outBuf != null ? outBuf : in; } From 566c4352036d05498545153939e8ec93ae99134e Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Tue, 18 Sep 2018 18:19:19 -0400 Subject: [PATCH 11/68] Fix Ref identifier A Ref has a refid, which indicates the element to which it is referring. Unlike id attributes, refid does not need to be unique per document. --- test-harness/src/main/resources/jetty-env.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-harness/src/main/resources/jetty-env.xml b/test-harness/src/main/resources/jetty-env.xml index 6bd144e0c..58d6efc2e 100644 --- a/test-harness/src/main/resources/jetty-env.xml +++ b/test-harness/src/main/resources/jetty-env.xml @@ -5,7 +5,7 @@ false - + type Embedded true @@ -17,7 +17,7 @@ - + BeanManager From dc6c02db77287b60b2d25b1ab6adf62b61dd08fb Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Wed, 26 Sep 2018 17:06:39 -0400 Subject: [PATCH 12/68] Replace collection cast with unbounded wildcard cast This makes my IDE happy, even though it basically just moves the location of the cast. In this location, the cast is made explicitly, as necessary. It is clearly intentional, whereas the original is sometimes done unintentionally. In the end, the real gain is a reduction in the noise produced by the compiler. --- .../pretty/faces/config/PrettyConfigurator.java | 12 ++++++------ .../faces/config/reload/PrettyConfigReloader.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java index bfce7b179..d0c620710 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java @@ -57,10 +57,10 @@ public void configure() { final PrettyConfigBuilder builder = new PrettyConfigBuilder(); - ServiceLoader configLoader = ServiceLoader.load(ConfigurationProvider.class); - for (ConfigurationProvider p : configLoader) + ServiceLoader configLoader = ServiceLoader.load(ConfigurationProvider.class); + for (Object p : configLoader) { - builder.addFromConfig(p.loadConfiguration(servletContext)); + builder.addFromConfig(((ConfigurationProvider) p).loadConfiguration(servletContext)); } config = builder.build(); @@ -73,10 +73,10 @@ public void configure() config = parenting.processConfiguration(servletContext, config); - ServiceLoader postProcessors = ServiceLoader.load(ConfigurationPostProcessor.class); - for (ConfigurationPostProcessor p : postProcessors) + ServiceLoader postProcessors = ServiceLoader.load(ConfigurationPostProcessor.class); + for (Object p : postProcessors) { - config = p.processConfiguration(servletContext, config); + config = ((ConfigurationPostProcessor) p).processConfiguration(servletContext, config); } ConfigurationPostProcessor validating = new ValidatingPostProcessor(); diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java index c4a2e9de6..0b1404b65 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java @@ -107,12 +107,12 @@ private boolean isDevelopmentModeActive(ServletContext servletContext) { // create the ServiceLoader for the SPI - ServiceLoader serviceLoader = ServiceLoader.load(DevelopmentModeDetector.class); + ServiceLoader serviceLoader = ServiceLoader.load(DevelopmentModeDetector.class); // we need a list to be able to sort it List detectors = new ArrayList(); - for (DevelopmentModeDetector detector : serviceLoader) { - detectors.add(detector); + for (Object detector : serviceLoader) { + detectors.add((DevelopmentModeDetector) detector); } // sort them by priority From a4eb8e30717de2fa28ea25dc037dc8bff1c01344 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Thu, 27 Sep 2018 01:35:14 -0400 Subject: [PATCH 13/68] Switch to loadTypesafe Switch to loadTypesafe to get rid of unchecked conversion warning. --- .../pretty/faces/config/PrettyConfigurator.java | 12 ++++++------ .../faces/config/reload/PrettyConfigReloader.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java index d0c620710..a2cb563e6 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/PrettyConfigurator.java @@ -57,10 +57,10 @@ public void configure() { final PrettyConfigBuilder builder = new PrettyConfigBuilder(); - ServiceLoader configLoader = ServiceLoader.load(ConfigurationProvider.class); - for (Object p : configLoader) + ServiceLoader configLoader = ServiceLoader.loadTypesafe(ConfigurationProvider.class); + for (ConfigurationProvider p : configLoader) { - builder.addFromConfig(((ConfigurationProvider) p).loadConfiguration(servletContext)); + builder.addFromConfig(p.loadConfiguration(servletContext)); } config = builder.build(); @@ -73,10 +73,10 @@ public void configure() config = parenting.processConfiguration(servletContext, config); - ServiceLoader postProcessors = ServiceLoader.load(ConfigurationPostProcessor.class); - for (Object p : postProcessors) + ServiceLoader postProcessors = ServiceLoader.loadTypesafe(ConfigurationPostProcessor.class); + for (ConfigurationPostProcessor p : postProcessors) { - config = ((ConfigurationPostProcessor) p).processConfiguration(servletContext, config); + config = p.processConfiguration(servletContext, config); } ConfigurationPostProcessor validating = new ValidatingPostProcessor(); diff --git a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java index 0b1404b65..e58e9cc15 100644 --- a/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java +++ b/config-prettyfaces/src/main/java/com/ocpsoft/pretty/faces/config/reload/PrettyConfigReloader.java @@ -107,12 +107,12 @@ private boolean isDevelopmentModeActive(ServletContext servletContext) { // create the ServiceLoader for the SPI - ServiceLoader serviceLoader = ServiceLoader.load(DevelopmentModeDetector.class); + ServiceLoader serviceLoader = ServiceLoader.loadTypesafe(DevelopmentModeDetector.class); // we need a list to be able to sort it List detectors = new ArrayList(); - for (Object detector : serviceLoader) { - detectors.add((DevelopmentModeDetector) detector); + for (DevelopmentModeDetector detector : serviceLoader) { + detectors.add(detector); } // sort them by priority From 048378f26ec81211b5db5288957bfb6d40cdb673 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Thu, 27 Sep 2018 18:20:20 -0400 Subject: [PATCH 14/68] Update to Java EE 7 Updating to the Java EE 7 versions: Servlet 3.1, JSF 2.2, EL 3.0, and CDI 1.2. Compile against Java SE 8. Side effects: 1. Update to Tomcat 8.5. Repaired so that it works. 2. Update Showcases to latest version. 3. Update Weld to 2.4.7 and Mojarra to 2.3.7. 4. Update JSTL to 1.2 and use jstl group. 5. Paramaterize so that versions stay consistent. 6. Update existing versions to latest. 7. Remove special version of Xalan that was needed for Java EE 6. 8. Exclude jconsole so the JDK version is used instead of the Wildfly version. 9. Update to latest httpclient 4.5.6 Caveats: 1. Tests fail locally in integration-gwt, transform-minify, and rewrite-impl-servlet-tests. Some tests fail that contain IgnoreFor notation, suggesting that the test is fragile. One test checks if content is uppercased. I'm not sure why that is a requirement there. --- annotations-impl/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 4 +- config-prettyfaces/pom.xml | 6 +- config-proxy/pom.xml | 4 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 3 +- config-tuckey/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 1 + impl-servlet-3.0/pom.xml | 1 + impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- .../impl/HttpRewriteWrappedResponse.java | 18 ++ integration-cdi-tests/pom.xml | 6 +- integration-cdi/pom.xml | 6 +- integration-faces-tests/pom.xml | 6 +- integration-faces/pom.xml | 10 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 181 ++++++++++++++---- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 10 +- showcase/composite-query/pom.xml | 6 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- .../rest-ws/src/main/webapp/WEB-INF/web.xml | 9 +- showcase/transform/pom.xml | 6 +- test-harness/pom.xml | 7 +- .../org/ocpsoft/rewrite/test/RewriteTest.java | 20 +- .../src/main/resources/arquillian.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 37 files changed, 251 insertions(+), 91 deletions(-) diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index 5f32888ae..35c25fa05 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -25,7 +25,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index b2af039f6..2a14df47c 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -21,7 +21,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 8957884f1..176650d8e 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -17,7 +17,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index d33b60687..0de58a200 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -38,7 +38,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec test diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 13795a94d..04c3932a8 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -33,12 +33,12 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec + jboss-jsf-api_${jsf.spec}_spec provided diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 048a8f13a..1d0b164ae 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -46,17 +46,17 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec + jboss-jsf-api_${jsf.spec}_spec provided org.jboss.spec.javax.el - jboss-el-api_2.2_spec + jboss-el-api_${el.spec}_spec provided diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 2fd0223e0..756b4a6c3 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -26,11 +26,11 @@ org.apache.httpcomponents httpclient - 4.3.1 + 4.5.6 org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index c1f179b19..fd60b2394 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -21,7 +21,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 1af153da7..cea60e7bb 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -25,7 +25,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided @@ -39,6 +39,7 @@ org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec + 1.0.2.Final test diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 8f35125ba..f921c2e1b 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -27,7 +27,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 15e00a41d..7a77d6230 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -22,6 +22,7 @@ org.jboss.spec.javax.servlet jboss-servlet-api_2.5_spec + 1.0.1.Final provided diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 5243dee97..db825cc13 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -22,6 +22,7 @@ org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec + 1.0.2.Final provided diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 4946c838a..024c5537e 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -28,7 +28,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec test diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 9fbf74637..cff6c04ab 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -37,7 +37,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java index f6d290b34..6e333c990 100644 --- a/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java @@ -30,6 +30,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -356,6 +357,23 @@ public String toString() { return stream.toString(); } + + /* (non-Javadoc) + * @see javax.servlet.ServletOutputStream#isReady() + */ + @Override + public boolean isReady() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletOutputStream#setWriteListener(javax.servlet.WriteListener) + */ + @Override + public void setWriteListener(WriteListener writeListener) { + // TODO Auto-generated method stub + } } /* diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index 69a5d4f99..c83854a43 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -32,17 +32,17 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec + jboss-jsf-api_${jsf.spec}_spec provided org.jboss.spec.javax.el - jboss-el-api_2.2_spec + jboss-el-api_${el.spec}_spec provided diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 103e42030..dfad59a27 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -11,7 +11,7 @@ rewrite-integration-cdi - 1.0-SP4 + 1.2 @@ -28,12 +28,12 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.el - jboss-el-api_2.2_spec + jboss-el-api_${el.spec}_spec provided diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index 530ddb170..d60653863 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -28,17 +28,17 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec + jboss-jsf-api_${jsf.spec}_spec provided org.jboss.spec.javax.el - jboss-el-api_2.2_spec + jboss-el-api_${el.spec}_spec provided diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index 3ffb1cccb..219f9f5dc 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -34,23 +34,23 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec + jboss-jsf-api_${jsf.spec}_spec provided org.jboss.spec.javax.el - jboss-el-api_2.2_spec + jboss-el-api_${el.spec}_spec provided - javax.servlet + jstl jstl - 1.1.2 + 1.2 provided diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 908aaf78e..e3a7fb91b 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -17,7 +17,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index dff2043d9..51892e1a7 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -29,7 +29,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/pom.xml b/pom.xml index 007582116..1e03db1e7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,23 +26,32 @@ UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - 1.7 - 1.7 + ${maven.compiler.target} + ${maven.compiler.source} + + + 7.0 + 3.1 + 2.2 + 3.0 - 3.0.2.Final - 4.11 + 1.1.1.Final + 4.12 + 1.2 1.0.5.Final 1.0.5.Final 1.1.1.Final 1.1.1.Final 1.0.0.CR4 + 1.1.0.Final 7.1.1.Final 8.2.0.Final + 8.5.34 3.1.2.2 4.0 ${java.io.tmpdir}/rewrite-arquillian-containers @@ -96,12 +105,10 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.2 - + org.apache.maven.plugins maven-release-plugin - 2.5.3 true true @@ -118,7 +125,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 + 2.22.0 -Xms256m -Xmx512m -XX:MaxPermSize=512m @@ -126,12 +133,12 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 3.01 false - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/6/api/ + http://docs.oracle.com/javase/8/docs/api/ + http://docs.oracle.com/javaee/7/api/ -Xdoclint:none @@ -362,27 +369,20 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom import - - - xalan - xalan - 2.7.1 - - org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec - 1.0.1.Final + jboss-servlet-api_${servlet.spec}_spec + 1.0.2.Final provided + junit junit @@ -390,13 +390,19 @@ test + + javax.inject + javax.inject + 1 + - + + org.jboss.shrinkwrap.resolver shrinkwrap-resolver-bom - 2.0.0 + 3.1.3 pom import @@ -491,8 +497,8 @@ org.jboss.spec - jboss-javaee-web-6.0 - 3.0.1.Final + jboss-javaee-web-${javaee.spec} + ${version.jboss.spec} pom test @@ -523,8 +529,8 @@ org.jboss.spec - jboss-javaee-web-6.0 - 3.0.1.Final + jboss-javaee-web-${javaee.spec} + ${version.jboss.spec} pom test @@ -590,7 +596,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom provided @@ -625,7 +631,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom provided @@ -686,7 +692,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom provided @@ -721,7 +727,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom provided @@ -747,6 +753,107 @@ + + TOMCAT_MANAGED_8.5_WELD + + + + maven-antrun-plugin + + + generate-test-resources + + run + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + tomcat_managed + weld + + + + + + + + javax.inject + javax.inject + + + org.glassfish + javax.faces + 2.3.7 + + + jstl + jstl + 1.2 + + + javax.enterprise + cdi-api + 1.2 + + + org.jboss.weld.servlet + weld-servlet + 2.4.7.Final + + + org.hibernate.validator + hibernate-validator + 6.0.11.Final + + + org.jboss.arquillian.container + arquillian-tomcat-managed-8 + ${version.arquillian.tomcat} + test + + + + org.jboss.weld + weld-core + 2.4.7.Final + test + + + org.slf4j + slf4j-simple + test + + + + WILDFLY_REMOTE_8 @@ -768,6 +875,12 @@ wildfly-arquillian-container-remote ${version.wildfly} test + + + sun.jdk + jconsole + + diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index e101c44f3..2741cc25d 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -43,7 +43,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec test diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 9657d8372..edd1d2ccd 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -14,7 +14,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} pom provided diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index dcf4e1cc3..3f1e18f7f 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -16,7 +16,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} pom provided @@ -48,5 +48,13 @@ 1.3.170 + + org.ocpsoft.rewrite + rewrite-config-annotations + + + org.ocpsoft.rewrite + rewrite-config-servlet + diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index f9fe4e15d..f6ba0d84a 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -14,7 +14,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} pom provided @@ -22,5 +22,9 @@ org.ocpsoft.rewrite rewrite-servlet + + org.ocpsoft.rewrite + rewrite-config-servlet + diff --git a/showcase/pom.xml b/showcase/pom.xml index 674334442..31e54dd7c 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -37,7 +37,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} ${version.jboss.spec} pom provided diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 1523be2c0..24f458f53 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -14,7 +14,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} pom provided diff --git a/showcase/rest-ws/src/main/webapp/WEB-INF/web.xml b/showcase/rest-ws/src/main/webapp/WEB-INF/web.xml index b68c5f2a0..d897eb594 100644 --- a/showcase/rest-ws/src/main/webapp/WEB-INF/web.xml +++ b/showcase/rest-ws/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,10 @@ - + + rewrite-showcase-rest diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 0e22545b9..3fa637423 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -16,7 +16,7 @@ org.jboss.spec - jboss-javaee-6.0 + jboss-javaee-${javaee.spec} pom provided @@ -41,5 +41,9 @@ rewrite-transform-minify + + org.ocpsoft.rewrite + rewrite-config-servlet + diff --git a/test-harness/pom.xml b/test-harness/pom.xml index bb659168b..d30bfbce4 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -29,7 +29,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided @@ -100,5 +100,10 @@ arquillian-drone-webdriver-depchain pom + + javax.enterprise + cdi-api + test + diff --git a/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java b/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java index d730c410d..78eb688c6 100644 --- a/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java +++ b/test-harness/src/main/java/org/ocpsoft/rewrite/test/RewriteTest.java @@ -98,25 +98,27 @@ public static WebArchive getDeploymentNoWebXml(String name) // Tomcat specific stuff if (isTomcat()) { + archive.addAsLibraries(resolveDependencies("javax.enterprise:cdi-api:1.2")); + archive.addAsLibraries(resolveDependencies("javax.inject:javax.inject:1")); + // setup Weld if (isWeld()) { - archive.addAsLibraries(resolveDependencies("org.jboss.weld:weld-core:1.1.9.Final")); - archive.addAsLibraries(resolveDependencies("org.jboss.weld.servlet:weld-servlet-core:1.1.9.Final")); + archive.addAsLibraries(resolveDependencies("org.jboss.weld:weld-core:2.4.7.Final")); + archive.addAsLibraries(resolveDependencies("org.jboss.weld.servlet:weld-servlet-core:2.4.7.Final")); archive.addAsWebResource("tomcat-weld-context.xml", "META-INF/context.xml"); } // setup OWB if (isOWB()) { - archive.addAsLibraries(resolveDependencies("javax.enterprise:cdi-api:1.0-SP4")); - archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-impl:1.1.5")); - archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-web:1.1.5")); - archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-spi:1.1.5")); - archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-resource:1.1.5")); + archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-impl:2.0.7")); + archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-web:2.0.7")); + archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-spi:2.0.7")); + archive.addAsLibraries(resolveDependencies("org.apache.openwebbeans:openwebbeans-resource:2.0.7")); archive.addAsWebResource("tomcat-owb-context.xml", "META-INF/context.xml"); } // setup Mojarra - archive.addAsLibraries(resolveDependencies("org.glassfish:javax.faces:2.1.13")); + archive.addAsLibraries(resolveDependencies("org.glassfish:javax.faces:2.3.7")); archive.addAsLibraries(resolveDependencies("javax.servlet:jstl:1.2")); } @@ -140,7 +142,7 @@ public static boolean isTomcat() { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); try { - classLoader.loadClass("org.jboss.arquillian.container.tomcat.managed_7.TomcatManagedContainer"); + classLoader.loadClass("org.jboss.arquillian.container.tomcat.managed.Tomcat8ManagedContainer"); return true; } catch (ClassNotFoundException e) { diff --git a/test-harness/src/main/resources/arquillian.xml b/test-harness/src/main/resources/arquillian.xml index 354c60672..96fa61437 100644 --- a/test-harness/src/main/resources/arquillian.xml +++ b/test-harness/src/main/resources/arquillian.xml @@ -20,7 +20,7 @@ - target/container/apache-tomcat-7 + target/container/apache-tomcat-8 38080 arquillian arquillian diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 81d000a64..22dbb1d2f 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -23,7 +23,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 9e679123a..e25dadae1 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -27,7 +27,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 801949e4a..e128726a9 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -23,7 +23,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided diff --git a/transform/pom.xml b/transform/pom.xml index 7013f5fbd..63c16a90b 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -19,7 +19,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_2.5_spec + jboss-servlet-api_${servlet.spec}_spec provided From 23f9d1371c7ff48074d46a75e5301e349c0a14ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Piotrowski?= Date: Wed, 3 Oct 2018 11:54:29 +0200 Subject: [PATCH 15/68] Added condition to skip scanning module-info.class files (Java 9 module metadata). --- .../annotation/scan/AbstractClassFinder.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java index a27850501..0a70cc716 100644 --- a/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java +++ b/annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java @@ -1,12 +1,12 @@ /* * Copyright 2010 Lincoln Baxter, III - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,16 +18,14 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; - import javax.servlet.ServletContext; - import org.ocpsoft.logging.Logger; import org.ocpsoft.rewrite.annotation.api.ClassVisitor; import org.ocpsoft.rewrite.annotation.spi.ClassFinder; /** * Base class for implementations of the {@link ClassFinder} interface. - * + * * @see ClassFinder * @author Christian Kaltepoth */ @@ -60,7 +58,7 @@ public abstract class AbstractClassFinder implements ClassFinder /** * Initialization procedure - * + * * @param servletContext The {@link ServletContext} of the web application. * @param classLoader The {@link ClassLoader} to use for loading classes * @param packageFilter The {@link PackageFilter} used to check if a package has to be scanned. @@ -76,7 +74,7 @@ public AbstractClassFinder(ServletContext servletContext, ClassLoader classLoade /** * Strip everything up to and including a given prefix from a string. - * + * * @param str The string to process * @param prefix The prefix * @return the stripped string or null if the prefix has not been found @@ -97,7 +95,7 @@ protected String stripKnownPrefix(String str, String prefix) *

* Creates a FQCN from an {@link URL} representing a .class file. *

- * + * * @param url The path of the class file * @return the FQCN of the class */ @@ -116,7 +114,7 @@ protected static String getClassName(String filename) /** * Checks if a supplied class has to be processed by checking the package name against the {@link PackageFilter}. - * + * * @param className FQCN of the class * @return true for classes to process, false for classes to ignore */ @@ -127,7 +125,7 @@ protected boolean mustProcessClass(String className) if (className.startsWith("META-INF.versions")) { return false; } - + // the default package String packageName = ""; @@ -157,7 +155,7 @@ protected boolean mustProcessClass(String className) *

* Please not the the called of this method is responsible to close the supplied {@link InputStream}! *

- * + * * @param className The FQCN of the class * @param classFileStream The Java class file of the class (may be null) * @param visitor the visitor @@ -165,6 +163,9 @@ protected boolean mustProcessClass(String className) protected void processClass(String className, InputStream classFileStream, ClassVisitor visitor) { + // skip Java 9 module metadata class files + if (className.equals("module-info")) return ; + // bytecode check is only performed if the InputStream is available if (classFileStream != null) { From 51dcc5fe0719acdd5cae1fefa7b9cbeb262ea188 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Thu, 4 Oct 2018 02:17:55 -0400 Subject: [PATCH 16/68] Restore Java EE 6 specifications This restores the Java EE 6 specification and makes a few other changes to simplify handling. The goal here is for versions and specifications to be chosen at the top of rewrite-parent/pom.xml and managed from there. That way they can be updated quickly and easily while being sure that versions will match. --- config-servlet/pom.xml | 1 - impl-servlet-2.5/pom.xml | 1 - impl-servlet-3.0/pom.xml | 1 - pom.xml | 50 ++++++++++++++++++++++++++++++---------- test-harness/pom.xml | 1 - 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index cea60e7bb..2b87dc471 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -39,7 +39,6 @@ org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec - 1.0.2.Final test diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 7a77d6230..15e00a41d 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -22,7 +22,6 @@ org.jboss.spec.javax.servlet jboss-servlet-api_2.5_spec - 1.0.1.Final provided diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index db825cc13..5243dee97 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -22,7 +22,6 @@ org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec - 1.0.2.Final provided diff --git a/pom.xml b/pom.xml index 1e03db1e7..efd1e9537 100644 --- a/pom.xml +++ b/pom.xml @@ -26,23 +26,26 @@ UTF-8 - 1.8 - 1.8 + 1.7 + 1.7 ${maven.compiler.target} ${maven.compiler.source} - 7.0 - 3.1 - 2.2 - 3.0 + 6.0 + 2.5 + 2.1 + 2.2 - 1.1.1.Final + 3.0.2.Final 4.12 - 1.2 + 1.0.1.Final + 1.0.1.Final + 1.0.2.Final + 1.0-SP4 1.0.5.Final 1.0.5.Final 1.1.1.Final @@ -105,7 +108,7 @@ org.apache.maven.plugins maven-shade-plugin - + org.apache.maven.plugins maven-release-plugin @@ -375,10 +378,32 @@ import + + + xalan + xalan + 2.7.1 + + org.jboss.spec.javax.servlet - jboss-servlet-api_${servlet.spec}_spec - 1.0.2.Final + jboss-servlet-api_2.5_spec + ${version.servlet.2.5} + provided + + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + ${version.servlet.3.0} + provided + + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + ${version.servlet.3.1} provided @@ -821,7 +846,8 @@ javax.enterprise cdi-api - 1.2 + ${version.cdi.api} + test org.jboss.weld.servlet diff --git a/test-harness/pom.xml b/test-harness/pom.xml index d30bfbce4..36566f32b 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -51,7 +51,6 @@ org.mockito mockito-core - 1.9.5 compile From 9eec2bfcf723e818cbc4d938d9d8e3c07ca7043a Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Thu, 4 Oct 2018 05:11:06 -0400 Subject: [PATCH 17/68] Remove Tomcat configuration that only works with Java EE 7 --- pom.xml | 102 -------------------------------------------------------- 1 file changed, 102 deletions(-) diff --git a/pom.xml b/pom.xml index efd1e9537..686b18f63 100644 --- a/pom.xml +++ b/pom.xml @@ -778,108 +778,6 @@ - - TOMCAT_MANAGED_8.5_WELD - - - - maven-antrun-plugin - - - generate-test-resources - - run - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - tomcat_managed - weld - - - - - - - - javax.inject - javax.inject - - - org.glassfish - javax.faces - 2.3.7 - - - jstl - jstl - 1.2 - - - javax.enterprise - cdi-api - ${version.cdi.api} - test - - - org.jboss.weld.servlet - weld-servlet - 2.4.7.Final - - - org.hibernate.validator - hibernate-validator - 6.0.11.Final - - - org.jboss.arquillian.container - arquillian-tomcat-managed-8 - ${version.arquillian.tomcat} - test - - - - org.jboss.weld - weld-core - 2.4.7.Final - test - - - org.slf4j - slf4j-simple - test - - - - WILDFLY_REMOTE_8 From 89e2e22960b9545c301699f5f2b52f326a904519 Mon Sep 17 00:00:00 2001 From: Matt Fletcher Date: Thu, 4 Oct 2018 05:32:50 -0400 Subject: [PATCH 18/68] Remove Servlet 3.1 update --- .../impl/HttpRewriteWrappedResponse.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java index 6e333c990..f6d290b34 100644 --- a/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java +++ b/impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteWrappedResponse.java @@ -30,7 +30,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -357,23 +356,6 @@ public String toString() { return stream.toString(); } - - /* (non-Javadoc) - * @see javax.servlet.ServletOutputStream#isReady() - */ - @Override - public boolean isReady() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletOutputStream#setWriteListener(javax.servlet.WriteListener) - */ - @Override - public void setWriteListener(WriteListener writeListener) { - // TODO Auto-generated method stub - } } /* From eded0bad0101d119a3a1e67ed3f97a3bc9a8222e Mon Sep 17 00:00:00 2001 From: mdfst13 <43025590+mdfst13@users.noreply.github.com> Date: Thu, 4 Oct 2018 04:30:39 -0400 Subject: [PATCH 19/68] Add entry for tests failing --- documentation/src/main/asciidoc/faq.asciidoc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/documentation/src/main/asciidoc/faq.asciidoc b/documentation/src/main/asciidoc/faq.asciidoc index eeeea688c..38524c2a4 100644 --- a/documentation/src/main/asciidoc/faq.asciidoc +++ b/documentation/src/main/asciidoc/faq.asciidoc @@ -55,3 +55,23 @@ For more details about this issue, have a look at this great link:http://stackoverflow.com/a/8050589/395181[stackoverflow answer] by link:http://stackoverflow.com/users/157882/balusc[BalusC]. +=== Why am I getting errors when I run tests? + +If you are getting errors about not being able to find a class that is +in a package not included by the current module under test or if you +are receiving the following error: + +____ +org.jboss.arquillian.container.test.impl.client.deployment.ValidationException: + +DeploymentScenario contains a target (_DEFAULT_) not matching +any defined Container in the registry. + +Please include at least 1 Deployable Container on your Classpath. +____ + +This may mean that you do not have a Maven profile defined for that +project. Without the Maven profile, Arquillian does not know where +to deploy the code for testing. You can find the different profiles +defined in the Rewrite parent pom.xml file. The GLASSFISH_MANAGED_3.1 +and GLASSFISH_MANAGED_4.0 profiles will download the container server +for you. + From b0c988764ac4f9897e0cc4f3dced9b5930a1b17e Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Wed, 15 May 2019 21:24:18 -0300 Subject: [PATCH 20/68] chore: fixed code example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfd37cc54..11618296b 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Get Started public Configuration getConfiguration(final ServletContext context) { return ConfigurationBuilder.begin() - .defineRule() + .addRule() .when(Direction.isInbound().and(Path.matches("/some/page/{p}/"))) .perform(Forward.to("/new-page/{p}.html")); } From c1061382cdc87a24db0bccaee99c30b05ff4d97d Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Mon, 11 Nov 2019 18:28:12 -0500 Subject: [PATCH 21/68] Update for JSF 2.3 Spec API --- .../rewrite/faces/RewriteViewHandler.java | 10 ++++++++-- pom.xml | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java index 5cb67773a..10582af48 100644 --- a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java @@ -23,6 +23,7 @@ import javax.faces.FacesException; import javax.faces.application.ViewHandler; +import javax.faces.application.ViewHandlerWrapper; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.view.ViewDeclarationLanguage; @@ -37,7 +38,7 @@ /** * @author Lincoln Baxter, III */ -public class RewriteViewHandler extends ViewHandler +public class RewriteViewHandler extends ViewHandlerWrapper { protected ViewHandler parent; private final ThreadLocal bookmarkable = new ThreadLocal(); @@ -189,6 +190,11 @@ public String getResourceURL(final FacesContext facesContext, final String path) return parent.getResourceURL(facesContext, path); } + @Override + public String getWebsocketURL(FacesContext context, String channel) { + return parent.getWebsocketURL(context, channel); + } + @Override public void renderView(final FacesContext facesContext, final UIViewRoot viewRoot) throws IOException, FacesException @@ -229,4 +235,4 @@ public void initView(final FacesContext context) throws FacesException { parent.initView(context); } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 686b18f63..4be645cb7 100644 --- a/pom.xml +++ b/pom.xml @@ -34,13 +34,13 @@ ${maven.compiler.source} - 6.0 + 8.0 2.5 - 2.1 - 2.2 + 2.3 + 3.0 - 3.0.2.Final + 1.0.4.Final 4.12 1.0.1.Final 1.0.1.Final @@ -385,6 +385,16 @@ xalan 2.7.1 + + org.apache.taglibs + taglibs-standard-spec + 1.2.5 + + + org.apache.taglibs + taglibs-standard-impl + 1.2.5 + org.jboss.spec.javax.servlet From 46d469a890631d6c9aad29adf632e48073087067 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Mon, 11 Nov 2019 18:28:43 -0500 Subject: [PATCH 22/68] [maven-release-plugin] prepare release 3.4.3.Final --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 949f84cbf..08253b075 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 9e0b6ca5c..9e4f28e27 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index 35c25fa05..e428458ba 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index d7f44ca78..282774495 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index 2a14df47c..c963a8538 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 176650d8e..740c23456 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/api/pom.xml b/api/pom.xml index ea58c69fc..823de5093 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 0de58a200..094263883 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index 32b0a3bf1..3baf56583 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 04c3932a8..5992a0b52 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 1d0b164ae..913c3f684 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 756b4a6c3..8ad918b5b 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index fd60b2394..127271d44 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 2b87dc471..0bdfcb6a1 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index f921c2e1b..88744610b 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index dbe529195..1e97f7726 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index 1c1c19649..b62943dfc 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/examples/pom.xml b/examples/pom.xml index 1db19e36c..1221827bf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 15e00a41d..7d17849d9 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 5243dee97..bacafc56c 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 024c5537e..351d7eab8 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index cff6c04ab..500e0d0bc 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index ba8bce80e..f7fba8e8c 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/impl/pom.xml b/impl/pom.xml index fb4da46ba..92417dd2c 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index c83854a43..e25456bbb 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index dfad59a27..1254046ad 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index d60653863..d7dbaa072 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index 219f9f5dc..bdfa6ef4f 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index e3a7fb91b..a44a79048 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 51892e1a7..911ea6b3a 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/pom.xml b/pom.xml index 4be645cb7..762f44302 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - HEAD + 3.4.3.Final diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index 84021b26c..3e2064648 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 2741cc25d..469e61c81 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index edd1d2ccd..546fa3159 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 3f1e18f7f..db0c06413 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index f6ba0d84a..9198739e5 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 31e54dd7c..c960934d8 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 24f458f53..81b34fdda 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 3fa637423..079d46a08 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 7a82b1e56..6ec98bbd1 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 36566f32b..392f3dc65 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 22dbb1d2f..c4d03c0c7 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index e25dadae1..5aa9ed396 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index e128726a9..3d02a697e 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ diff --git a/transform/pom.xml b/transform/pom.xml index 63c16a90b..e2a008a6a 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3-SNAPSHOT + 3.4.3.Final ../ From ab803644c9c525c28612686514765881992e9413 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Mon, 11 Nov 2019 18:28:43 -0500 Subject: [PATCH 23/68] [maven-release-plugin] prepare for next development iteration --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 08253b075..7c0f3b0b8 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 9e4f28e27..c9b504f16 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index e428458ba..300f1b30f 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 282774495..de4f77687 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index c963a8538..d3edc33e8 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 740c23456..c72e2ec7b 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/api/pom.xml b/api/pom.xml index 823de5093..212680202 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 094263883..bb25e14e7 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index 3baf56583..a3c0eed6b 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 5992a0b52..5addbc48d 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 913c3f684..2a0f570bd 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 8ad918b5b..435fc1806 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index 127271d44..e88c6fda2 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 0bdfcb6a1..71121cb7c 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 88744610b..1a734b8ca 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index 1e97f7726..a9bf26a88 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index b62943dfc..c75ee3d24 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/examples/pom.xml b/examples/pom.xml index 1221827bf..cb162d772 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 7d17849d9..867f6cd37 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index bacafc56c..c65f4f4d8 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 351d7eab8..befc879eb 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 500e0d0bc..62279dfc8 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index f7fba8e8c..57331a1a6 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/impl/pom.xml b/impl/pom.xml index 92417dd2c..1aa07e175 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index e25456bbb..9680314c3 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 1254046ad..473a3442a 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index d7dbaa072..9eaedbc57 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index bdfa6ef4f..c6a9c0f4c 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index a44a79048..975245256 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 911ea6b3a..33a1004f1 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index 762f44302..f575efabc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - 3.4.3.Final + HEAD diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index 3e2064648..429514746 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 469e61c81..33bc475d9 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 546fa3159..3f2400527 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index db0c06413..90126963e 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 9198739e5..08a29f911 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index c960934d8..eaba62c4f 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 81b34fdda..a165292d8 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 079d46a08..8e2fd343f 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 6ec98bbd1..9e1208bff 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 392f3dc65..8328eca8f 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index c4d03c0c7..de897e67f 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 5aa9ed396..118d573d8 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 3d02a697e..d473967a6 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ diff --git a/transform/pom.xml b/transform/pom.xml index e2a008a6a..fe308ca38 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.3.Final + 3.4.4-SNAPSHOT ../ From 37f363f9ec8556aac9b7940153de078df9a850eb Mon Sep 17 00:00:00 2001 From: Cody Lerum Date: Fri, 29 Nov 2019 17:14:50 -0700 Subject: [PATCH 24/68] use openjdk8 with travis. oracle is gone and 7 is EOL --- .travis.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36a4762d8..ab073d41d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,18 +8,10 @@ after_success: - "bash ./.travis-deploy.sh" matrix: include: - - env: CONTAINER=JBOSS_AS_MANAGED_7.X - jdk: openjdk7 - env: CONTAINER=WILDFLY_MANAGED_8 - jdk: oraclejdk8 - - env: CONTAINER=GLASSFISH_MANAGED_3.1 - jdk: openjdk7 + jdk: openjdk8 - env: CONTAINER=GLASSFISH_MANAGED_4.0 - jdk: oraclejdk8 - - env: CONTAINER=TOMEE_MANAGED_1.5 - jdk: openjdk7 - allow_failures: - - env: CONTAINER=TOMEE_MANAGED_1.5 + jdk: openjdk8 notifications: email: - "ocpsoft-ci@googlegroups.com" From 827440beda7debf2c8e37ead9e9225ebf6111002 Mon Sep 17 00:00:00 2001 From: Xavier Dury Date: Fri, 6 Dec 2019 21:47:09 +0100 Subject: [PATCH 25/68] Fix for #285 --- .../rewrite/faces/RewriteViewHandler.java | 93 +------------------ 1 file changed, 5 insertions(+), 88 deletions(-) diff --git a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java index 10582af48..870b30ad2 100644 --- a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java @@ -40,7 +40,6 @@ */ public class RewriteViewHandler extends ViewHandlerWrapper { - protected ViewHandler parent; private final ThreadLocal bookmarkable = new ThreadLocal(); private volatile List providers; @@ -61,12 +60,6 @@ private boolean isBookmarkable() return result; } - @Override - public String deriveLogicalViewId(final FacesContext context, final String rawViewId) - { - return parent.deriveLogicalViewId(context, rawViewId); - } - private void setBookmarkable(final boolean value) { bookmarkable.set(value); @@ -74,34 +67,7 @@ private void setBookmarkable(final boolean value) public RewriteViewHandler(final ViewHandler viewHandler) { - super(); - parent = viewHandler; - } - - @Override - public Locale calculateLocale(final FacesContext facesContext) - { - return parent.calculateLocale(facesContext); - } - - @Override - public String calculateRenderKitId(final FacesContext facesContext) - { - return parent.calculateRenderKitId(facesContext); - } - - @Override - public UIViewRoot createView(final FacesContext context, final String viewId) - { - UIViewRoot view = parent.createView(context, viewId); - return view; - } - - @Override - public UIViewRoot restoreView(final FacesContext context, final String viewId) - { - UIViewRoot view = parent.restoreView(context, viewId); - return view; + super(viewHandler); } @Override @@ -129,7 +95,7 @@ public String getActionURL(final FacesContext context, final String viewId) if (result != null) { - String parentActionURL = parent.getActionURL(context, viewId); + String parentActionURL = getWrapped().getActionURL(context, viewId); if (parentActionURL.contains("?")) { URLBuilder builder = URLBuilder.createFrom(result); @@ -139,7 +105,7 @@ public String getActionURL(final FacesContext context, final String viewId) } } if (result == null) - result = parent.getActionURL(context, viewId); + result = getWrapped().getActionURL(context, viewId); return result; } @@ -172,42 +138,11 @@ public String getBookmarkableURL(final FacesContext context, final String viewId * When this method is called for tags, getActionURL is called as part of the parent call */ setBookmarkable(true); - String result = parent.getBookmarkableURL(context, viewId, parameters, includeViewParams); + String result = getWrapped().getBookmarkableURL(context, viewId, parameters, includeViewParams); setBookmarkable(false); return result; } - @Override - public String getRedirectURL(final FacesContext context, final String viewId, - final Map> parameters, final boolean includeViewParams) - { - return parent.getRedirectURL(context, viewId, parameters, includeViewParams); - } - - @Override - public String getResourceURL(final FacesContext facesContext, final String path) - { - return parent.getResourceURL(facesContext, path); - } - - @Override - public String getWebsocketURL(FacesContext context, String channel) { - return parent.getWebsocketURL(context, channel); - } - - @Override - public void renderView(final FacesContext facesContext, final UIViewRoot viewRoot) throws IOException, - FacesException - { - parent.renderView(facesContext, viewRoot); - } - - @Override - public void writeState(final FacesContext facesContext) throws IOException - { - parent.writeState(facesContext); - } - /** * Canonicalize the given viewId, then pass that viewId to the next ViewHandler in the chain. */ @@ -215,24 +150,6 @@ public void writeState(final FacesContext facesContext) throws IOException public String deriveViewId(final FacesContext context, final String rawViewId) { String canonicalViewId = new URLDuplicatePathCanonicalizer().canonicalize(rawViewId); - return parent.deriveViewId(context, canonicalViewId); - } - - @Override - public String calculateCharacterEncoding(final FacesContext context) - { - return parent.calculateCharacterEncoding(context); - } - - @Override - public ViewDeclarationLanguage getViewDeclarationLanguage(final FacesContext context, final String viewId) - { - return parent.getViewDeclarationLanguage(context, viewId); - } - - @Override - public void initView(final FacesContext context) throws FacesException - { - parent.initView(context); + return getWrapped().deriveViewId(context, canonicalViewId); } } From b632cb14b4faadb36821a8a56fe8092d7767dca5 Mon Sep 17 00:00:00 2001 From: Xavier Dury Date: Sat, 7 Dec 2019 10:18:52 +0100 Subject: [PATCH 26/68] Restored backwards compatibility (JSF 2.2) --- .../rewrite/faces/RewriteViewHandler.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java index 870b30ad2..35843eced 100644 --- a/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java +++ b/integration-faces/src/main/java/org/ocpsoft/rewrite/faces/RewriteViewHandler.java @@ -40,6 +40,7 @@ */ public class RewriteViewHandler extends ViewHandlerWrapper { + protected ViewHandler parent; private final ThreadLocal bookmarkable = new ThreadLocal(); private volatile List providers; @@ -67,7 +68,8 @@ private void setBookmarkable(final boolean value) public RewriteViewHandler(final ViewHandler viewHandler) { - super(viewHandler); + super(); + parent = viewHandler; } @Override @@ -95,7 +97,7 @@ public String getActionURL(final FacesContext context, final String viewId) if (result != null) { - String parentActionURL = getWrapped().getActionURL(context, viewId); + String parentActionURL = parent.getActionURL(context, viewId); if (parentActionURL.contains("?")) { URLBuilder builder = URLBuilder.createFrom(result); @@ -105,7 +107,7 @@ public String getActionURL(final FacesContext context, final String viewId) } } if (result == null) - result = getWrapped().getActionURL(context, viewId); + result = parent.getActionURL(context, viewId); return result; } @@ -138,7 +140,7 @@ public String getBookmarkableURL(final FacesContext context, final String viewId * When this method is called for tags, getActionURL is called as part of the parent call */ setBookmarkable(true); - String result = getWrapped().getBookmarkableURL(context, viewId, parameters, includeViewParams); + String result = parent.getBookmarkableURL(context, viewId, parameters, includeViewParams); setBookmarkable(false); return result; } @@ -150,6 +152,12 @@ public String getBookmarkableURL(final FacesContext context, final String viewId public String deriveViewId(final FacesContext context, final String rawViewId) { String canonicalViewId = new URLDuplicatePathCanonicalizer().canonicalize(rawViewId); - return getWrapped().deriveViewId(context, canonicalViewId); + return parent.deriveViewId(context, canonicalViewId); + } + + @Override + public ViewHandler getWrapped() + { + return parent; } } From 47e67007381f0aa207c75a95979669f7f3617faf Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 10 Dec 2019 13:06:11 -0500 Subject: [PATCH 27/68] [maven-release-plugin] prepare release 3.4.4.Final --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 7c0f3b0b8..b95af3d0c 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index c9b504f16..d5e9bf87e 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index 300f1b30f..c290389ef 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index de4f77687..3ac7e4914 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index d3edc33e8..bce9a726a 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index c72e2ec7b..1a1e7261c 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/api/pom.xml b/api/pom.xml index 212680202..2ab09476b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index bb25e14e7..1fc3b2e3c 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index a3c0eed6b..fb1d8d7b4 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 5addbc48d..f817e3615 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 2a0f570bd..9e93a21ec 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 435fc1806..9535e6eaa 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index e88c6fda2..bea94a851 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 71121cb7c..59f0cdb58 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 1a734b8ca..75038b59a 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index a9bf26a88..041e8ab10 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index c75ee3d24..962ce8adf 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/examples/pom.xml b/examples/pom.xml index cb162d772..985a22232 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 867f6cd37..a711907ad 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index c65f4f4d8..96a5cf7ab 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index befc879eb..d4abadb8f 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 62279dfc8..d257920ef 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index 57331a1a6..e325bcbce 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/impl/pom.xml b/impl/pom.xml index 1aa07e175..0f33dd4b9 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index 9680314c3..9b0541e22 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 473a3442a..a31594877 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index 9eaedbc57..b61a0c406 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index c6a9c0f4c..67467f36f 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 975245256..6f210a7cc 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 33a1004f1..32d73c05f 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/pom.xml b/pom.xml index f575efabc..a8b9f19d5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - HEAD + 3.4.4.Final diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index 429514746..7e8000883 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 33bc475d9..7d3606277 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 3f2400527..70e4d30c9 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 90126963e..706e3271f 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 08a29f911..2e7fb5885 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index eaba62c4f..5f10d130f 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index a165292d8..0c3f67e8b 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 8e2fd343f..c069d4262 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 9e1208bff..3e0955470 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 8328eca8f..8d04185ef 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index de897e67f..3ed554933 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 118d573d8..88f21c4d0 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index d473967a6..dcf61d109 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ diff --git a/transform/pom.xml b/transform/pom.xml index fe308ca38..93cf93457 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4-SNAPSHOT + 3.4.4.Final ../ From 56168c80e9d5792c72b955423cf8e568389ce931 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 10 Dec 2019 13:06:12 -0500 Subject: [PATCH 28/68] [maven-release-plugin] prepare for next development iteration --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index b95af3d0c..72db0eee4 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index d5e9bf87e..3d1a1a17f 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index c290389ef..e10976d86 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 3ac7e4914..636e9cabc 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index bce9a726a..351b40641 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 1a1e7261c..9c98860bc 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/api/pom.xml b/api/pom.xml index 2ab09476b..0da539871 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 1fc3b2e3c..8cb450b95 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index fb1d8d7b4..e9f9c2567 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index f817e3615..891b70793 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 9e93a21ec..66bd2eabc 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 9535e6eaa..f61e8e453 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index bea94a851..66a90fcc7 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 59f0cdb58..25872c827 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 75038b59a..c51b18f4c 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index 041e8ab10..b2c2d20b2 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index 962ce8adf..5b6f0c405 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/examples/pom.xml b/examples/pom.xml index 985a22232..1f1ac633b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index a711907ad..c9439b6a7 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 96a5cf7ab..7cb5528d5 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index d4abadb8f..92d11058b 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index d257920ef..153e86543 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index e325bcbce..12880fc55 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/impl/pom.xml b/impl/pom.xml index 0f33dd4b9..fe3483b2a 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index 9b0541e22..c53a25e7a 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index a31594877..5f895ed40 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index b61a0c406..37e89235b 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index 67467f36f..1454cad30 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 6f210a7cc..28663f174 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 32d73c05f..d57870d88 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index a8b9f19d5..178f75855 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - 3.4.4.Final + HEAD diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index 7e8000883..aac064a18 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 7d3606277..a69a5ff32 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 70e4d30c9..59bf2994d 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 706e3271f..68797ee9f 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 2e7fb5885..37c8afdb2 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 5f10d130f..e7e7872b4 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 0c3f67e8b..7c74c7321 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index c069d4262..e020f5056 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 3e0955470..b56c34aaa 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 8d04185ef..e76ee8565 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 3ed554933..e1aa3e2dd 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 88f21c4d0..f0b127de7 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index dcf61d109..588999a77 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ diff --git a/transform/pom.xml b/transform/pom.xml index 93cf93457..ae759c771 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.4.Final + 3.4.5-SNAPSHOT ../ From 94da33b7ffaa64d4c73ab5d0351c2b0809c56c08 Mon Sep 17 00:00:00 2001 From: Xavier Dury Date: Mon, 16 Dec 2019 11:19:48 +0100 Subject: [PATCH 29/68] Added HttpOperations for HttpSession --- .../rewrite/servlet/config/Session.java | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Session.java diff --git a/config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Session.java b/config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Session.java new file mode 100644 index 000000000..46de1a2c3 --- /dev/null +++ b/config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/Session.java @@ -0,0 +1,73 @@ +/* + * Copyright 2011 Lincoln Baxter, III + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.ocpsoft.rewrite.servlet.config; + +import org.ocpsoft.rewrite.context.EvaluationContext; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; + +import javax.servlet.http.HttpSession; + +/** + * Responsible for performing actions on the current {@link HttpSession} + */ +public abstract class Session extends HttpOperation +{ + + /** + * Creates an {@link HttpOperation} that calls {@link HttpSession#invalidate()} on the current + * session. + */ + public static Session invalidate() + { + return new Session() { + @Override + public void performHttp(HttpServletRewrite event, EvaluationContext context) + { + event.getRequest().getSession().invalidate(); + } + + @Override + public String toString() + { + return "Session.invalidate()"; + } + }; + } + + /** + * Creates an {@link HttpOperation} that calls {@link HttpSession#setAttribute(String, Object)} on the current + * session. + * + * @param name The name of the session attribute + * @param value The value to set + */ + public static Session setAttribute(final String name, final Object value) + { + return new Session() { + @Override + public void performHttp(HttpServletRewrite event, EvaluationContext context) + { + event.getRequest().getSession().setAttribute(name, value); + } + + @Override + public String toString() + { + return "Session.setAttribute(\"" + name + "\", \"" + value + "\")"; + } + }; + } +} From 2ec22e1cf7e665fd54a4d0d46ac8b034980e05c1 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Tue, 11 Feb 2020 10:01:44 -0500 Subject: [PATCH 30/68] Use HTTPS instead of HTTP to resolve dependencies This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- showcase/rest-ws/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 7c74c7321..7e0138729 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -35,7 +35,7 @@ ocpsoft - http://ocpsoft.org/repository/ + https://ocpsoft.org/repository/ From 675a711775b18c13089cce9c6030e54553d5485e Mon Sep 17 00:00:00 2001 From: Tobias Ullerich Date: Fri, 13 Mar 2020 11:49:15 +0100 Subject: [PATCH 31/68] Update commons-beanutils version in config-prettyfaces --- config-prettyfaces/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 66bd2eabc..6431f4977 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -12,6 +12,7 @@ 2.0 + 1.9.4 @@ -44,6 +45,11 @@ commons-digester ${version.digester} + + commons-beanutils + commons-beanutils + ${version.beanutils} + org.jboss.spec.javax.servlet jboss-servlet-api_${servlet.spec}_spec From 53cb60596b9613f0f938cd03e58b198632fa516d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 May 2020 21:16:22 +0000 Subject: [PATCH 32/68] Bump htmlunit from 2.12 to 2.37.0 in /test-harness Bumps [htmlunit](https://github.com/HtmlUnit/htmlunit) from 2.12 to 2.37.0. - [Release notes](https://github.com/HtmlUnit/htmlunit/releases) - [Commits](https://github.com/HtmlUnit/htmlunit/compare/HtmlUnit-2.12...2.37.0) Signed-off-by: dependabot[bot] --- test-harness/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-harness/pom.xml b/test-harness/pom.xml index e76ee8565..e485f8925 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -64,7 +64,7 @@ net.sourceforge.htmlunit htmlunit - 2.12 + 2.37.0 compile From 8f7ca5261158f5e7d6fc2539fe679a12767723c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20D=C3=ADez?= Date: Mon, 1 Feb 2021 11:17:27 +0100 Subject: [PATCH 33/68] Prevented adding the same binding multiple times. fixes gh-223 --- .../rewrite/param/ParameterBuilder.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java index 2fa062cf1..8b4184639 100644 --- a/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java +++ b/api/src/main/java/org/ocpsoft/rewrite/param/ParameterBuilder.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.ListIterator; import org.ocpsoft.rewrite.bind.Binding; @@ -65,13 +66,30 @@ public IMPLTYPE configuredBy(ParameterConfigurator configurator) @SuppressWarnings("unchecked") public IMPLTYPE bindsTo(final Binding binding) { - /* - * Bindings must be added to the front of the list, since we want the - * ability to override the default binding if necessary. - */ - this.bindings.add(0, binding); + addOrReplaceBinding(binding); return (IMPLTYPE) this; } + + /* + * Bindings must be added to the front of the list, since we want the + * ability to override the default binding if necessary. + */ + private void addOrReplaceBinding(final Binding binding) + { + ListIterator iterator = this.bindings.listIterator(); + while(iterator.hasNext()) + { + Binding current = iterator.next(); + if(current.toString().equals(binding.toString())) // binding does not implements equals/hashCode + { + iterator.remove(); + iterator.add(binding); + return; + } + } + + this.bindings.add(0, binding); + } @Override public List getBindings() From 065d8459caa23ad0a94ea46c4efdda20514206e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20D=C3=ADez?= Date: Mon, 15 Feb 2021 22:53:22 +0100 Subject: [PATCH 34/68] Added test to reproduce #223 --- .../config/JoinBindingConfigurationProvider.java | 16 +++++++++++++++- .../config/JoinBindingConfigurationTest.java | 10 ++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationProvider.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationProvider.java index eaa5b49b9..2c6e78bec 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationProvider.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationProvider.java @@ -19,8 +19,10 @@ import org.ocpsoft.rewrite.config.Configuration; import org.ocpsoft.rewrite.config.ConfigurationBuilder; +import org.ocpsoft.rewrite.context.EvaluationContext; import org.ocpsoft.rewrite.servlet.config.bind.RequestBinding; import org.ocpsoft.rewrite.servlet.config.rule.Join; +import org.ocpsoft.rewrite.servlet.http.event.HttpServletRewrite; /** * @author Lincoln Baxter, III @@ -39,7 +41,19 @@ public Configuration getConfiguration(final ServletContext context) Configuration config = ConfigurationBuilder.begin() .addRule(Join.path("/bind/{id}").to("/bind.html")) .where("id").bindsTo(RequestBinding.parameter("join-id")) - + + .addRule(Join.path("/users/{userId}").to("/user.html")) + .perform(new HttpOperation() { + @Override + public void performHttp(HttpServletRewrite event, EvaluationContext context) + { + for (String userId : event.getRequest().getParameterValues("userId")) { + event.getResponse().addHeader("userId", userId); + } + SendStatus.code(200).perform(event, context); + } + }) + .addRule() .when(Path.matches("/bind.html").and(RequestParameter.exists("join-id"))) .perform(SendStatus.code(201)); diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java index 91201c72a..a66aef409 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java @@ -56,4 +56,14 @@ public void testUrlMappingConfigurationWithoutInboundCorrection() throws Excepti HttpAction action = get("/bind.html"); Assert.assertEquals(404, action.getResponse().getStatusLine().getStatusCode()); } + + @Test + public void testUrlMappingWithoutRepeatedParameters() throws Exception + { + HttpAction action = get("/users/didiez"); + String[] expected = new String[]{"didiez"}; + + Assert.assertEquals(200, action.getResponse().getStatusLine().getStatusCode()); + Assert.assertArrayEquals(expected, action.getResponseHeaderValues("userId").toArray()); + } } \ No newline at end of file From 877f666f81768b407b132e563eb76151c3c48115 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Sat, 27 Feb 2021 10:17:11 -0500 Subject: [PATCH 35/68] Update to fix dependabot alert, even though this isn't a security risk because it's just the test harness. --- test-harness/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-harness/pom.xml b/test-harness/pom.xml index e76ee8565..e485f8925 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -64,7 +64,7 @@ net.sourceforge.htmlunit htmlunit - 2.12 + 2.37.0 compile From 3c3fee514e7b632f5d8f9218a0083ee5f0cae455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 15:17:41 +0000 Subject: [PATCH 36/68] Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 178f75855..32c384b45 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 1.0.4.Final - 4.12 + 4.13.1 1.0.1.Final 1.0.1.Final 1.0.2.Final From bd4c34825b5cc52d05806ea09bbd2ee1ce685a93 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Sat, 27 Feb 2021 10:19:46 -0500 Subject: [PATCH 37/68] [maven-release-plugin] prepare release 3.5.0.Final --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 72db0eee4..9238d5813 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 3d1a1a17f..32a29a348 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index e10976d86..6290263e7 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 636e9cabc..d538dca80 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index 351b40641..5990e9676 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 9c98860bc..ca6b71f8f 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/api/pom.xml b/api/pom.xml index 0da539871..d2d76e305 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 8cb450b95..d639ebcd4 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index e9f9c2567..3bd098614 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 891b70793..8c20aa6cb 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 66bd2eabc..659ba46c7 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index f61e8e453..80ef59135 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index 66a90fcc7..524089c2f 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 25872c827..9b97f01cb 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index c51b18f4c..dd9b6a208 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index b2c2d20b2..d1fc6a221 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index 5b6f0c405..23030405c 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/examples/pom.xml b/examples/pom.xml index 1f1ac633b..aefbe5fae 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index c9439b6a7..5e6d86dea 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 7cb5528d5..6e1291f5d 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 92d11058b..348520a6b 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 153e86543..f12705b1e 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index 12880fc55..576d175c2 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/impl/pom.xml b/impl/pom.xml index fe3483b2a..8459b9c3d 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index c53a25e7a..c687ff638 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 5f895ed40..3ddf0852b 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index 37e89235b..157f50210 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index 1454cad30..efa20656b 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 28663f174..fc884d23a 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index d57870d88..035e66c6e 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/pom.xml b/pom.xml index 178f75855..907543e38 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - HEAD + 3.5.0.Final diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index aac064a18..f9a0909e3 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index a69a5ff32..18e371e01 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 59bf2994d..5bc34d563 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 68797ee9f..b9882d9aa 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 37c8afdb2..0a9fa4fa6 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index e7e7872b4..07f18a693 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 7c74c7321..0a035eafa 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index e020f5056..66c28e438 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index b56c34aaa..042616d6b 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index e485f8925..269d1ce70 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index e1aa3e2dd..9fc8f5d46 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index f0b127de7..870e0c050 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 588999a77..6dfdc19a4 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ diff --git a/transform/pom.xml b/transform/pom.xml index ae759c771..749db6654 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.4.5-SNAPSHOT + 3.5.0.Final ../ From 1544767cf82943fa3389730ca0c49ec3dc4f88f0 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Sat, 27 Feb 2021 10:19:47 -0500 Subject: [PATCH 38/68] [maven-release-plugin] prepare for next development iteration --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 9238d5813..efbc89cc4 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 32a29a348..489798a2e 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index 6290263e7..a56775616 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index d538dca80..b9c3ca347 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index 5990e9676..8561026a8 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index ca6b71f8f..3247d556a 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/api/pom.xml b/api/pom.xml index d2d76e305..a29b3ac0f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index d639ebcd4..7378d6b6b 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index 3bd098614..318e27d5b 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 8c20aa6cb..f709e460c 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 659ba46c7..336d6c0fa 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 80ef59135..104f7f5a1 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index 524089c2f..3a2f60737 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 9b97f01cb..fe256fa9b 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index dd9b6a208..0b18b9da5 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index d1fc6a221..da7ea8892 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index 23030405c..c80db0d96 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/examples/pom.xml b/examples/pom.xml index aefbe5fae..082a3b81a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 5e6d86dea..dabfe1915 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 6e1291f5d..da0603ff7 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index 348520a6b..968b47aa0 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index f12705b1e..f35f30d99 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index 576d175c2..e5ec933a0 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/impl/pom.xml b/impl/pom.xml index 8459b9c3d..717a2f879 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index c687ff638..4a8acf53c 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 3ddf0852b..9d2ee4b69 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index 157f50210..6d0264c9f 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index efa20656b..c44b4c7d1 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index fc884d23a..fc0275880 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 035e66c6e..4a61a063f 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index 907543e38..a30547bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - 3.5.0.Final + HEAD diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index f9a0909e3..3129a4954 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 18e371e01..463373f23 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 5bc34d563..5e84669c1 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index b9882d9aa..c1f1bdca1 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 0a9fa4fa6..efa67096c 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 07f18a693..60049aacd 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 0a035eafa..33a3d4928 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 66c28e438..360910c82 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 042616d6b..88864cca7 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 269d1ce70..35c96444d 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 9fc8f5d46..f002fe3d8 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 870e0c050..3b95d6741 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 6dfdc19a4..c14b6e210 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ diff --git a/transform/pom.xml b/transform/pom.xml index 749db6654..c79e2d0ca 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.0.Final + 3.5.1-SNAPSHOT ../ From 49fed52f322a0ebe964bb909b2c0e8b9562e7482 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Sat, 27 Feb 2021 10:25:34 -0500 Subject: [PATCH 39/68] Removed stale changelog --- CHANGELOG.md | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 335883995..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,35 +0,0 @@ ------------------------------------- -VERSION 1.1.0 -============= - -Features & Enhancements: -======================== -* Enabled fluent chaining of additional Condition and Operation instances when adding single/custom rules by calling `ConfigurationBuilder.addRule(new CustomRule()).when(...).perform(...);` -* Added Response output buffering support. -* JAAS support with JAASRoles condition -* Content Delivery Network support with CDN rule -* Typesafe method invocation support -* Issue #30 - Tasks may now be performed in a SubFlow without affecting the Flow of the entire Rewrite event. -* Preview of Transformer APIs -* Preview of Annotation Configuration API - -Regression Impact: -================== -* Configuration strings are now literal. Regular expressions must be configured through a parameter such as: `.defineRule().when(Path.matches("/{*}").where("*").matches(".*"))` -* Join no longer matches Forwarded requests. -* EL API is now a separate module and the Java package name has changed to 'org.ocpsoft.rewrite.el' - -Bug Fixes: -========== -* Parameter binding now works on Join rules. -* Issue #67 - Keep order of fluent rules when building configuration. -* Fixed NumberFormatException on EncodeQuery operation when hashCode of checksum is modified -* Fixed ArrayIndexOutOfBounds exception for parsing query-strings with a separator but no content "?" -* Fixed showcase applications -* Issue #51 - Join no longer matches its own Forwarded requests. -* Fixed GWT integration issue where context path was not correctly transmitted when client application is hosted under the root URL "/" -* TypeBasedExpression no longer requires the expression to be surrounded by "#{...}" -* Fixed bug where container would swallow certain resource requests, resulting in false 404 errors -* Issue #32 - PhaseBinding defers validation and conversion until within the JSF lifecycle. -* Issue #33 - ClassVisitorImpl now supports adding rules to the ConfigurationBuilder if necessary -* Fixed some bugs with URLEncoding/URLDecoding From cfc101fc8b73f22ed4cb0c0491e08638b57dd7a9 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Mon, 12 Apr 2021 13:34:59 -0400 Subject: [PATCH 40/68] Fix issue with XSD that causes some editors to fail schema parsing --- .../src/main/resources/META-INF/rewrite-config-prettyfaces.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-prettyfaces/src/main/resources/META-INF/rewrite-config-prettyfaces.xsd b/config-prettyfaces/src/main/resources/META-INF/rewrite-config-prettyfaces.xsd index a1387e61d..a3131c6c8 100644 --- a/config-prettyfaces/src/main/resources/META-INF/rewrite-config-prettyfaces.xsd +++ b/config-prettyfaces/src/main/resources/META-INF/rewrite-config-prettyfaces.xsd @@ -1,4 +1,4 @@ - + - - org.apache.httpcomponents - httpclient - 4.5.13 - compile - - - net.sourceforge.htmlunit - htmlunit - 2.12 - compile - - org.jboss.shrinkwrap.resolver shrinkwrap-resolver-api From fa92eca8325a372c1ffaa47e92ad8eef6400700b Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 01:41:45 +0200 Subject: [PATCH 51/68] Fix prettyfaces tests --- config-prettyfaces/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index ff828e2d0..0e0df2c5f 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -56,8 +56,9 @@ provided - org.jboss.spec.javax.faces - jboss-jsf-api_${jsf.spec}_spec + org.glassfish + javax.faces + 2.3.9 provided From 184be924b7ea08b8c79436294c73026d24c5534b Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 02:04:41 +0200 Subject: [PATCH 52/68] Cache Maven-Dependencies on GithubActions --- .github/workflows/maven.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5a58d9ae3..5756935a5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,11 +14,11 @@ jobs: with: java-version: 8 distribution: 'temurin' + cache: 'maven' - run: ./mvnw --batch-mode --update-snapshots install -DskipTests test: runs-on: ubuntu-latest - strategy: fail-fast: false matrix: @@ -30,4 +30,5 @@ jobs: with: java-version: 8 distribution: 'temurin' + cache: 'maven' - run: ./mvnw --batch-mode --update-snapshots -P ${{ matrix.container }} install \ No newline at end of file From f062c2de011383dbc650baaf732450484f1c2c59 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 02:13:54 +0200 Subject: [PATCH 53/68] Move CI and Publishing completly to GitHub Actions --- .travis-settings.xml => .github/settings.xml | 0 .github/workflows/maven-deploy.yml | 19 +++++++++++++++++++ .travis-deploy.sh | 15 --------------- .travis.yml | 14 +------------- 4 files changed, 20 insertions(+), 28 deletions(-) rename .travis-settings.xml => .github/settings.xml (100%) create mode 100644 .github/workflows/maven-deploy.yml delete mode 100644 .travis-deploy.sh diff --git a/.travis-settings.xml b/.github/settings.xml similarity index 100% rename from .travis-settings.xml rename to .github/settings.xml diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml new file mode 100644 index 000000000..1b9a7b2ff --- /dev/null +++ b/.github/workflows/maven-deploy.yml @@ -0,0 +1,19 @@ +name: Deploy Snapshots + +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: 8 + distribution: 'temurin' + cache: 'maven' + - run: ./mvnw --batch-mode -s .github/settings.xml -DperformRelease -DskipTests -Dgpg.skip=true deploy diff --git a/.travis-deploy.sh b/.travis-deploy.sh deleted file mode 100644 index 1e3902145..000000000 --- a/.travis-deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ "$TRAVIS_REPO_SLUG" == "ocpsoft/rewrite" ] && - [ "$TRAVIS_BRANCH" == "master" ] && - [ "$TRAVIS_PULL_REQUEST" == "false" ] && - [ "$TRAVIS_JDK_VERSION" == "openjdk7" ] && - [ "$CONTAINER" == "JBOSS_AS_MANAGED_7.X" ]; then - - echo "Starting snapshot deployment..." - mvn -s .travis-settings.xml -DperformRelease -DskipTests -Dgpg.skip=true deploy - echo "Snapshots deployed!" - -else - echo "Skipping snapshot deployment..." -fi diff --git a/.travis.yml b/.travis.yml index ab073d41d..36aa79624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,5 @@ language: java -cache: - directories: - - '$HOME/.m2/repository' -script: - - mvn -P ${CONTAINER} install -after_success: - - "bash ./.travis-deploy.sh" -matrix: - include: - - env: CONTAINER=WILDFLY_MANAGED_8 - jdk: openjdk8 - - env: CONTAINER=GLASSFISH_MANAGED_4.0 - jdk: openjdk8 + notifications: email: - "ocpsoft-ci@googlegroups.com" From adc82629db31141c6a17dad35a9fb325eaf6b971 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 23:43:36 +0200 Subject: [PATCH 54/68] Fill Env-Variables from Secrets --- .github/workflows/maven-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index 1b9a7b2ff..e6ab5d737 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -17,3 +17,6 @@ jobs: distribution: 'temurin' cache: 'maven' - run: ./mvnw --batch-mode -s .github/settings.xml -DperformRelease -DskipTests -Dgpg.skip=true deploy + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From c3c1a63a727644d7250e12680e6e5f2cb6b56abe Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 23:44:11 +0200 Subject: [PATCH 55/68] Update to setup-java v3 --- .github/workflows/maven-deploy.yml | 2 +- .github/workflows/maven.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index e6ab5d737..30dc0d18e 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 8 distribution: 'temurin' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5756935a5..cc23b33cc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 8 distribution: 'temurin' @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3g with: java-version: 8 distribution: 'temurin' From 3c50acbd1cb67b9855b471592973137fba219071 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 23:44:55 +0200 Subject: [PATCH 56/68] Fully remove travis configuration --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 36aa79624..000000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: java - -notifications: - email: - - "ocpsoft-ci@googlegroups.com" - irc: - - "chat.freenode.net#ocpsoft" -env: - global: - - secure: "KtSGBCGZ0lhTFvDlD2hPS3G3PalOU+vPZSZ3cFiooCt5NNiPfu7wDlL4874QIlC3T85aBB1AoHBleQl/uDTrYx4pmAYba0hluHQcmfQpvoLXpe/vPpns3AEv5o3/AnPXX3gB8TMldIPcFnS/j5glB7Ur/OYKo10Ae2c2QAD4pR4=" - - secure: "NMIxl5oRmUBP0xxCBe3nEsR8SOckeFtG564Ruaos55FDW6/1OVJ5BjgAuaEFJB8jKv6hRaZYaLsR9axzMm4YPssmC5D9xVdROnS4AnHauTX0+lwENpO9mYnnex7Ol221AOImeYdJvU1SU3JpgTiti7HOIleCciTMdNs2GirBw7s=" From 72959fc54848d791db6eaaf8724e9045b9184134 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 7 Jun 2022 23:46:01 +0200 Subject: [PATCH 57/68] Update to setup-java v3 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cc23b33cc..32a82356f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 8 - uses: actions/setup-java@v3g + uses: actions/setup-java@v3 with: java-version: 8 distribution: 'temurin' From 8b41f07c2d188a27d5a370ec6fae9ce84b70e53f Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Sat, 11 Jun 2022 01:55:16 +0200 Subject: [PATCH 58/68] Try to fix snapshot builds --- .github/settings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/settings.xml b/.github/settings.xml index 43e247106..ab7ee0ea9 100644 --- a/.github/settings.xml +++ b/.github/settings.xml @@ -7,6 +7,11 @@ ${env.SONATYPE_USERNAME} ${env.SONATYPE_PASSWORD} + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + From 33203064fee612760df9ded9b971f7641d6867c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 23:09:25 +0000 Subject: [PATCH 59/68] Bump xalan from 2.7.1 to 2.7.2 Bumps xalan from 2.7.1 to 2.7.2. --- updated-dependencies: - dependency-name: xalan:xalan dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 976add7da..ec11f27dc 100644 --- a/pom.xml +++ b/pom.xml @@ -383,7 +383,7 @@ xalan xalan - 2.7.1 + 2.7.2 org.apache.taglibs From 393a9d84b345c1fbc84f9fca917ca18de6317ad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 23:52:08 +0000 Subject: [PATCH 60/68] Bump spring-web in /config-prettyfaces Bumps [spring-web](https://github.com/SpringSource/spring-framework) from 3.0.2.RELEASE to 3.2.5.RELEASE. - [Release notes](https://github.com/SpringSource/spring-framework/releases) - [Commits](https://github.com/SpringSource/spring-framework/compare/v3.0.2.RELEASE...v3.2.5.RELEASE) --- updated-dependencies: - dependency-name: org.springframework:spring-web dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- config-prettyfaces/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 0e0df2c5f..5c195c95d 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -105,7 +105,7 @@ org.springframework spring-web - 3.0.2.RELEASE + 3.2.5.RELEASE test From 46b858efbee65d630cb712249c2b0973536514c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 23:52:24 +0000 Subject: [PATCH 61/68] Bump spring-web in /integration-spring Bumps [spring-web](https://github.com/SpringSource/spring-framework) from 3.0.6.RELEASE to 3.2.5.RELEASE. - [Release notes](https://github.com/SpringSource/spring-framework/releases) - [Commits](https://github.com/SpringSource/spring-framework/compare/v3.0.6.RELEASE...v3.2.5.RELEASE) --- updated-dependencies: - dependency-name: org.springframework:spring-web dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- integration-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index 46650dd56..d5592e895 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -11,7 +11,7 @@ rewrite-integration-spring - 3.0.6.RELEASE + 3.2.5.RELEASE From 081871aa06d3dd366100b025bc62bfbabadf7457 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Tue, 21 Mar 2023 11:08:26 -0400 Subject: [PATCH 62/68] fix(xml): update schema urls to use https --- .../src/test/resources/context/pretty-config.xml | 8 ++++---- .../resources/dynaview/ambiguous-pretty-config.xml | 2 +- .../test/resources/encoding/encoding-pretty-config.xml | 2 +- .../resources/errorpage/errorpage-pretty-config.xml | 2 +- .../interaction/faces-navigate-pretty-config.xml | 2 +- .../interaction/interaction-pretty-config.xml | 2 +- .../src/test/resources/loop/loop-pretty-config.xml | 2 +- .../test/resources/outbound/outbound-pretty-config.xml | 2 +- .../src/test/resources/pathparams/pretty-config.xml | 10 +++++----- .../test/resources/redirect/redirect-pretty-config.xml | 2 +- .../src/test/resources/rule_naming/pretty-config.xml | 10 +++++----- .../trailingslash/trailingslash-pretty-config.xml | 2 +- .../src/test/resources/META-INF/pretty-config.xml | 2 +- .../src/test/resources/mock-pretty-config.xml | 2 +- .../src/test/resources/rewrite-pretty-config.xml | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml index 73a3f01e2..169c5fac2 100644 --- a/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml @@ -1,11 +1,11 @@ - + xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces + https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd"> - /index.jsf + \ No newline at end of file diff --git a/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml index 2072c6e04..35afe7323 100644 --- a/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml index f1c303b3b..5378dc71b 100644 --- a/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml index 5a6c07b20..008ea235f 100644 --- a/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml index 09c1e77d9..e85050ada 100644 --- a/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml index f44747d89..958b7e236 100644 --- a/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml index 29044ed1a..2e46c0b8a 100644 --- a/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml index c2b30899d..80eaafd91 100644 --- a/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.3 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.3.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml index 9335933fa..eb5ec06b1 100644 --- a/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml @@ -1,17 +1,17 @@ - + xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces + https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd"> - /index.jsf + - /index.jsf + \ No newline at end of file diff --git a/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml index 7bb99d2ac..45fb11494 100644 --- a/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml index 5bbc607e7..64149ff3a 100644 --- a/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml @@ -1,16 +1,16 @@ - + xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces + https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd"> - /index.jsf + - /test.jsf + \ No newline at end of file diff --git a/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml index ed9ad2566..7d875fe52 100644 --- a/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml +++ b/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml @@ -1,6 +1,6 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml b/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml index de46b0a28..45ca571f1 100644 --- a/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml +++ b/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml @@ -2,7 +2,7 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces/src/test/resources/mock-pretty-config.xml b/config-prettyfaces/src/test/resources/mock-pretty-config.xml index aff40430c..f142cdfa1 100644 --- a/config-prettyfaces/src/test/resources/mock-pretty-config.xml +++ b/config-prettyfaces/src/test/resources/mock-pretty-config.xml @@ -2,7 +2,7 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> diff --git a/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml b/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml index cd91703ba..652d4257c 100644 --- a/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml +++ b/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml @@ -2,7 +2,7 @@ + https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd"> From c940d14452c4b08a816c1cba04f64c128a583687 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 4 Oct 2023 16:41:15 -0400 Subject: [PATCH 63/68] feat(docs): add version reference table --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 8dec372e5..5db498489 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,13 @@ Get Started ${rewrite.version} + Version Reference Table: + ------------------------------------- + Jakarta EE 10 | Rewrite 10.x + Jakarta EE 9 | Rewrite 9.x + Jakarta EE 8 | Rewrite 8.x + Java EE <= 7 | Rewrite 3.x + 3. Add a configuration provider implementing the 'org.ocpsoft.rewrite.config.ConfigurationProvider' interface, or extending from the abstract HttpConfigurationProvider class for convenience: package com.example; From 265ad67bb66e9920c205799203e8dbde89f0f8cc Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 4 Oct 2023 17:09:08 -0400 Subject: [PATCH 64/68] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5db498489..834e2845c 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,10 @@ mvn package -PWILDFLY_MANAGED_8 ``` (Or use any of the other profiles in pom.xml - Note, most seem to be failing right now due to stale maven packages. Pull requests fixing test proviles are appreciated!) +RELEASING +======== +See https://github.com/ocpsoft/rewrite/wiki/Releasing#current-process + FEEDBACK ======== From 39583e0657aaafe8548fd386c6058747b3c9c32f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 13:52:26 +0000 Subject: [PATCH 65/68] chore(security): Bump org.apache.shiro:shiro-web in /security-integration-shiro --- security-integration-shiro/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index fc10f0f66..9bc3f5fe0 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -19,7 +19,7 @@ org.apache.shiro shiro-web - 1.2.0 + 1.12.0 provided From d3e3a02c00720e18b356fc82a86e4eb8a1f94996 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 1 Nov 2023 11:08:14 -0400 Subject: [PATCH 66/68] chore: update xalan for CVE fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec11f27dc..08ded6116 100644 --- a/pom.xml +++ b/pom.xml @@ -383,7 +383,7 @@ xalan xalan - 2.7.2 + 2.7.3 org.apache.taglibs From 3653f8c2c389abd82591b1ce7746b6e09584062e Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 1 Nov 2023 11:24:15 -0400 Subject: [PATCH 67/68] [maven-release-plugin] prepare release 3.5.2.Final --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 53dfc39b4..67b5c4363 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index 8b039e25a..d3a439337 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index dd4c04bda..fcd43b628 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index d6e8040e9..065b9ee52 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index fc5336d39..fedb5d578 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 061ae0963..872b7ba37 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/api/pom.xml b/api/pom.xml index 88e28a728..493775a66 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index e83fde27e..7920637a5 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index ed2825d4e..3ca8d1dfb 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 8c7903289..18bc863d1 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index 5c195c95d..fa7163183 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index e69c1341b..897e63819 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index 2d255c756..d515d5693 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 76ebcc1c1..1dcea9f6c 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 5a9076507..4c4e6505b 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index e4c27a6b9..d708637cf 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index da41699bd..be5819b84 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/examples/pom.xml b/examples/pom.xml index 3e2370415..974d5a1c7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 480b2280a..659a95df2 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 2b0649f63..804c51439 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index c2cbf8343..f63312302 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 64bf8d217..0f5b2e025 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index 3f58e823e..20cf20f7d 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/impl/pom.xml b/impl/pom.xml index a5b5e627a..f166d1c1d 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index b813357a4..82ebd098a 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index 549375720..ecef703b7 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index b1b1e7a48..c559a86c8 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index ffb1378ed..086ae2e8c 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 4f3bdd234..188afb258 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index d5592e895..eda503ce8 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/pom.xml b/pom.xml index 08ded6116..d21393cea 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - HEAD + 3.5.2.Final diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index db2b5c3cd..0d4a8085b 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 9bc3f5fe0..4cfbdac9b 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index bf36d85ec..4c813f1ea 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 002311118..7e1effac2 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index ed77effac..10358e91b 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 265355b6e..38f91b6c7 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 25b31e93f..9c974a107 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index e051fedb6..01b00744f 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index 10e728757..a04fd52f2 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index d1bbeecff..0f45b62d7 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index 8d0b26152..e08f1acee 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index 2c5b3c357..c092dd5f8 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index 07372caac..a35b9ed5f 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ diff --git a/transform/pom.xml b/transform/pom.xml index 26aa040b8..f8e4dbb84 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2-SNAPSHOT + 3.5.2.Final ../ From 6ed0cbfa838a546f3400e98660d3b992d408a15b Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 1 Nov 2023 11:24:15 -0400 Subject: [PATCH 68/68] [maven-release-plugin] prepare for next development iteration --- addressbuilder/pom.xml | 2 +- annotations-api/pom.xml | 2 +- annotations-impl/pom.xml | 2 +- api-el/pom.xml | 2 +- api-servlet/pom.xml | 2 +- api-tests/pom.xml | 2 +- api/pom.xml | 2 +- config-annotations/pom.xml | 2 +- config-jodatime/pom.xml | 2 +- config-prettyfaces-tests/pom.xml | 2 +- config-prettyfaces/pom.xml | 2 +- config-proxy/pom.xml | 2 +- config-servlet-tests/pom.xml | 2 +- config-servlet/pom.xml | 2 +- config-tuckey/pom.xml | 2 +- distribution/pom.xml | 2 +- documentation/pom.xml | 2 +- examples/pom.xml | 2 +- impl-servlet-2.5/pom.xml | 2 +- impl-servlet-3.0/pom.xml | 2 +- impl-servlet-tests/pom.xml | 2 +- impl-servlet/pom.xml | 2 +- impl-tests/pom.xml | 2 +- impl/pom.xml | 2 +- integration-cdi-tests/pom.xml | 2 +- integration-cdi/pom.xml | 2 +- integration-faces-tests/pom.xml | 2 +- integration-faces/pom.xml | 2 +- integration-gwt/pom.xml | 2 +- integration-spring/pom.xml | 2 +- pom.xml | 4 ++-- rewrite-servlet/pom.xml | 2 +- security-integration-shiro/pom.xml | 2 +- showcase/access-control/pom.xml | 2 +- showcase/bookstore/pom.xml | 2 +- showcase/composite-query/pom.xml | 2 +- showcase/pom.xml | 2 +- showcase/rest-ws/pom.xml | 2 +- showcase/transform/pom.xml | 2 +- test-base/pom.xml | 2 +- test-harness/pom.xml | 2 +- transform-less/pom.xml | 2 +- transform-markup/pom.xml | 2 +- transform-minify/pom.xml | 2 +- transform/pom.xml | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addressbuilder/pom.xml b/addressbuilder/pom.xml index 67b5c4363..db0065cda 100644 --- a/addressbuilder/pom.xml +++ b/addressbuilder/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/annotations-api/pom.xml b/annotations-api/pom.xml index d3a439337..3facab9c6 100644 --- a/annotations-api/pom.xml +++ b/annotations-api/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/annotations-impl/pom.xml b/annotations-impl/pom.xml index fcd43b628..f0a0e8907 100644 --- a/annotations-impl/pom.xml +++ b/annotations-impl/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/api-el/pom.xml b/api-el/pom.xml index 065b9ee52..a759a1ffc 100644 --- a/api-el/pom.xml +++ b/api-el/pom.xml @@ -13,7 +13,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/api-servlet/pom.xml b/api-servlet/pom.xml index fedb5d578..d981c2061 100644 --- a/api-servlet/pom.xml +++ b/api-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/api-tests/pom.xml b/api-tests/pom.xml index 872b7ba37..9a8dbc12a 100644 --- a/api-tests/pom.xml +++ b/api-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/api/pom.xml b/api/pom.xml index 493775a66..014e37c10 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -14,7 +14,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-annotations/pom.xml b/config-annotations/pom.xml index 7920637a5..8083e3634 100644 --- a/config-annotations/pom.xml +++ b/config-annotations/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-jodatime/pom.xml b/config-jodatime/pom.xml index 3ca8d1dfb..c8da70e95 100644 --- a/config-jodatime/pom.xml +++ b/config-jodatime/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-prettyfaces-tests/pom.xml b/config-prettyfaces-tests/pom.xml index 18bc863d1..7e58b4ada 100644 --- a/config-prettyfaces-tests/pom.xml +++ b/config-prettyfaces-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index fa7163183..bf09b7e0b 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 897e63819..5a27bbb64 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-servlet-tests/pom.xml b/config-servlet-tests/pom.xml index d515d5693..a97aa4cd5 100644 --- a/config-servlet-tests/pom.xml +++ b/config-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-servlet/pom.xml b/config-servlet/pom.xml index 1dcea9f6c..0589add59 100644 --- a/config-servlet/pom.xml +++ b/config-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index 4c4e6505b..5c41f9772 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/distribution/pom.xml b/distribution/pom.xml index d708637cf..62cc1a41b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/documentation/pom.xml b/documentation/pom.xml index be5819b84..8f4d2c87c 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/examples/pom.xml b/examples/pom.xml index 974d5a1c7..4e72ff197 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl-servlet-2.5/pom.xml b/impl-servlet-2.5/pom.xml index 659a95df2..bf17ed73f 100644 --- a/impl-servlet-2.5/pom.xml +++ b/impl-servlet-2.5/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl-servlet-3.0/pom.xml b/impl-servlet-3.0/pom.xml index 804c51439..691348447 100644 --- a/impl-servlet-3.0/pom.xml +++ b/impl-servlet-3.0/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl-servlet-tests/pom.xml b/impl-servlet-tests/pom.xml index f63312302..d0fe7e8d3 100644 --- a/impl-servlet-tests/pom.xml +++ b/impl-servlet-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl-servlet/pom.xml b/impl-servlet/pom.xml index 0f5b2e025..2f3bc3033 100644 --- a/impl-servlet/pom.xml +++ b/impl-servlet/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl-tests/pom.xml b/impl-tests/pom.xml index 20cf20f7d..d3e59face 100644 --- a/impl-tests/pom.xml +++ b/impl-tests/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/impl/pom.xml b/impl/pom.xml index f166d1c1d..f6517c34b 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/integration-cdi-tests/pom.xml b/integration-cdi-tests/pom.xml index 82ebd098a..d15fc64c0 100644 --- a/integration-cdi-tests/pom.xml +++ b/integration-cdi-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/integration-cdi/pom.xml b/integration-cdi/pom.xml index ecef703b7..dde5ecf5d 100644 --- a/integration-cdi/pom.xml +++ b/integration-cdi/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/integration-faces-tests/pom.xml b/integration-faces-tests/pom.xml index c559a86c8..6c333fa2c 100644 --- a/integration-faces-tests/pom.xml +++ b/integration-faces-tests/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/integration-faces/pom.xml b/integration-faces/pom.xml index 086ae2e8c..622fce7b8 100644 --- a/integration-faces/pom.xml +++ b/integration-faces/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/integration-gwt/pom.xml b/integration-gwt/pom.xml index 188afb258..1d8709f55 100644 --- a/integration-gwt/pom.xml +++ b/integration-gwt/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../pom.xml diff --git a/integration-spring/pom.xml b/integration-spring/pom.xml index eda503ce8..718fb2d52 100644 --- a/integration-spring/pom.xml +++ b/integration-spring/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index d21393cea..971782b38 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT pom @@ -904,7 +904,7 @@ scm:git:git://github.com/ocpsoft/rewrite.git scm:git:git@github.com:ocpsoft/rewrite.git http://github.com/ocpsoft/rewrite - 3.5.2.Final + HEAD diff --git a/rewrite-servlet/pom.xml b/rewrite-servlet/pom.xml index 0d4a8085b..34fb7bbc0 100644 --- a/rewrite-servlet/pom.xml +++ b/rewrite-servlet/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/security-integration-shiro/pom.xml b/security-integration-shiro/pom.xml index 4cfbdac9b..9ebcd0862 100644 --- a/security-integration-shiro/pom.xml +++ b/security-integration-shiro/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../pom.xml diff --git a/showcase/access-control/pom.xml b/showcase/access-control/pom.xml index 4c813f1ea..11db68510 100644 --- a/showcase/access-control/pom.xml +++ b/showcase/access-control/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/showcase/bookstore/pom.xml b/showcase/bookstore/pom.xml index 7e1effac2..481c0ba36 100644 --- a/showcase/bookstore/pom.xml +++ b/showcase/bookstore/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/showcase/composite-query/pom.xml b/showcase/composite-query/pom.xml index 10358e91b..ec3d5f3e4 100644 --- a/showcase/composite-query/pom.xml +++ b/showcase/composite-query/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/showcase/pom.xml b/showcase/pom.xml index 38f91b6c7..6d00de606 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -4,7 +4,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/showcase/rest-ws/pom.xml b/showcase/rest-ws/pom.xml index 9c974a107..a6ab79fd0 100644 --- a/showcase/rest-ws/pom.xml +++ b/showcase/rest-ws/pom.xml @@ -4,7 +4,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/showcase/transform/pom.xml b/showcase/transform/pom.xml index 01b00744f..a1b710961 100644 --- a/showcase/transform/pom.xml +++ b/showcase/transform/pom.xml @@ -5,7 +5,7 @@ rewrite-showcase org.ocpsoft.rewrite.showcase - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/test-base/pom.xml b/test-base/pom.xml index a04fd52f2..c1b813a94 100644 --- a/test-base/pom.xml +++ b/test-base/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 0f45b62d7..b6fff6115 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -5,7 +5,7 @@ rewrite-parent org.ocpsoft.rewrite - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/transform-less/pom.xml b/transform-less/pom.xml index e08f1acee..79be2ca69 100644 --- a/transform-less/pom.xml +++ b/transform-less/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/transform-markup/pom.xml b/transform-markup/pom.xml index c092dd5f8..2a311955a 100644 --- a/transform-markup/pom.xml +++ b/transform-markup/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index a35b9ed5f..e5fd2a2ca 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../ diff --git a/transform/pom.xml b/transform/pom.xml index f8e4dbb84..d96a1fc6d 100644 --- a/transform/pom.xml +++ b/transform/pom.xml @@ -4,7 +4,7 @@ org.ocpsoft.rewrite rewrite-parent - 3.5.2.Final + 3.5.3-SNAPSHOT ../