This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-cache.git
The following commit(s) were added to refs/heads/master by this push:
new de07c05 Moved to site 2.0.0, update parent, yaafi, testcontainer to
released versions (13,2.0.1,2.0.1), add check for Thread.isInterrupted in run
method of GlobalCacheService
de07c05 is described below
commit de07c057a8650e593755606e6a7d062cd9356e2a
Author: Georg Kallidis <[email protected]>
AuthorDate: Tue Oct 15 16:47:29 2024 +0200
Moved to site 2.0.0, update parent, yaafi, testcontainer to released
versions (13,2.0.1,2.0.1), add check for Thread.isInterrupted in run method of
GlobalCacheService
---
NOTICE.txt | 2 +-
pom.xml | 6 +--
.../cache/impl/DefaultGlobalCacheService.java | 2 +-
src/site/site.xml | 43 +++++++++++++++++++---
{xdocs => src/site/xdoc}/index.xml | 0
5 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index ef23b64..29af4e5 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Turbine Fulcrum Cache Component
-Copyright 2005-2021 The Apache Software Foundation.
+Copyright 2005-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index a8ff702..692a56c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>13</version>
<relativePath />
</parent>
@@ -114,13 +114,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/src/java/org/apache/fulcrum/cache/impl/DefaultGlobalCacheService.java
b/src/java/org/apache/fulcrum/cache/impl/DefaultGlobalCacheService.java
index dff4501..49a55a6 100644
--- a/src/java/org/apache/fulcrum/cache/impl/DefaultGlobalCacheService.java
+++ b/src/java/org/apache/fulcrum/cache/impl/DefaultGlobalCacheService.java
@@ -264,7 +264,7 @@ public class DefaultGlobalCacheService extends
AbstractLogEnabled implements
@Override
public void run()
{
- while (this.continueThread)
+ while (this.continueThread && !Thread.currentThread().isInterrupted())
{
// Sleep for amount of time set in cacheCheckFrequency -
// default = 5 seconds.
diff --git a/src/site/site.xml b/src/site/site.xml
index e5b0a0f..7f53695 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,10 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
- name="Fulcrum Cache">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="Apache Turbine - Fulcrum Cache" combine.self="merge">
+
+ <bannerLeft href="https://turbine.apache.org/";>
+ <image src="https://turbine.apache.org/images/turbine-project.png";
alt="Apache Turbine" />
+ </bannerLeft>
+
+ <bannerRight/>
+
+ <publishDate format="dd MMMM yyyy" position="left" />
+ <version position="left" />
+
+ <!-- IMPORTANT Notice: elements like bannerLeft, publishDate, version,
links, skin and custom
+ are redundant after updating to released parent pom v14 which allows
skin inheritance again.
+ -->
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>2.0.0-M11</version>
+ </skin>
<body>
@@ -37,5 +54,21 @@
</menu>
</body>
+
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ <googleSearch>
+ <sitesearch>${project.url}</sitesearch>
+ </googleSearch>
+ <gitHub>
+ <projectId>apache/${turbine.site.path}</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>gray</ribbonColor>
+ </gitHub>
+ </fluidoSkin>
+ </custom>
-</project>
+</site>
diff --git a/xdocs/index.xml b/src/site/xdoc/index.xml
similarity index 100%
rename from xdocs/index.xml
rename to src/site/xdoc/index.xml
![https://turbine.apache.org/images/turbine-project.png"](https://turbine.apache.org/images/turbine-project.png"){kind=link}