You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2026/06/19 13:43:16 UTC
(turbine-core) branch trunk updated (1e093796 -> 2674a87d)
This is an automated email from the ASF dual-hosted git repository.
gmkll pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
from 1e093796 Merge pull request #13 from apache/infrastructure-ruleset-bot/default-branch-protection
new 8ac1d034 Use fulcrum parser v4.0.1-SNAPSHOT
new be7a6fc1 Fix yaml test to be more robust.
new 2674a87d Merge branch 'trunk' of github.com:apache/turbine-core into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../services/urlmapper/TurbineURLMapperYAMLServiceTest.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
(turbine-core) 01/03: Use fulcrum parser v4.0.1-SNAPSHOT
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gmkll pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 8ac1d0346d9e2d7c13e2e5678274e832140f03c0
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Apr 17 13:14:11 2026 +0200
Use fulcrum parser v4.0.1-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cface5ab..01e14c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1332,7 +1332,7 @@
<!-- this is the context path of the turbine release -->
<turbine.url.path>turbine/turbine-7-0</turbine.url.path>
<fulcrum.intake>4.0.0</fulcrum.intake>
- <fulcrum.parser>4.0.0</fulcrum.parser>
+ <fulcrum.parser>4.0.1-SNAPSHOT</fulcrum.parser>
<fulcrum.security>4.0.0</fulcrum.security>
<fulcrum.localization>2.0.0</fulcrum.localization>
<fulcrum.quartz>2.0.0</fulcrum.quartz>
(turbine-core) 02/03: Fix yaml test to be more robust.
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gmkll pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit be7a6fc193465305993bb1283d9ff8c8e6170472
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Jun 19 15:42:06 2026 +0200
Fix yaml test to be more robust.
---
.../services/urlmapper/TurbineURLMapperYAMLServiceTest.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java b/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java
index 52f24da0..842fb2d5 100644
--- a/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java
+++ b/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperYAMLServiceTest.java
@@ -131,8 +131,17 @@ public class TurbineURLMapperYAMLServiceTest extends BaseTestCase
uri2.setTemplate( "default.vm" );
uri2.addPathInfo( pp );
// this is an artifical url
- assertEquals( "scheme://bob/wow/damn2/template/default.vm/media-type/html/role/guest/id/1234/language/de",
- uri2.getAbsoluteLink() );
+ // "scheme://bob/wow/damn2/template/default.vm/media-type/html/role/guest/id/1234/language/de",
+ // but entries may be reversed.
+ assertTrue( uri2.getAbsoluteLink().startsWith( "scheme://bob/wow/damn2/template/default.vm/") );
+ uri2.getPathInfo().stream()
+ .filter( entry -> entry.getKey().equals("role") )
+ .findFirst()
+ .get().getValue().equals( "guest" );
+ uri2.getPathInfo().stream()
+ .filter( entry -> entry.getKey().equals("language") )
+ .findFirst()
+ .get().getValue().equals( "de" );
urlMapper.mapToURL( uri2 );
assertEquals( expectedMappedURL, uri2.getRelativeLink() );
}
(turbine-core) 03/03: Merge branch 'trunk' of github.com:apache/turbine-core into trunk
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gmkll pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 2674a87d6379d9ab50b7e377065374779ce9ccd3
Merge: be7a6fc1 1e093796
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Jun 19 15:42:42 2026 +0200
Merge branch 'trunk' of github.com:apache/turbine-core into trunk
.asf.yaml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)