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-pool.git
commit f69ee12e63ccaf376f5a50aaf2d374a9a734c31d Author: Georg Kallidis <[email protected]> AuthorDate: Mon Nov 18 14:30:44 2024 +0100 Remove snapshot from parent and fulcrum dependencies, update to site 2.0.0, update changes.xml, format BoundexBuffer.java consistent --- pom.xml | 6 +-- src/changes/changes.xml | 5 +- .../org/apache/fulcrum/pool/BoundedBuffer.java | 2 +- src/site/site.xml | 54 ++++++++++++++++++++-- {xdocs => src/site/xdoc}/index.xml | 0 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 3138e74..71c5769 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> - <version>13-SNAPSHOT</version> + <version>13</version> <relativePath /> </parent> @@ -90,13 +90,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> <dependency> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ad37d4e..041c258 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,7 +24,10 @@ </properties> <body> - <release version="1.0.6" date="in SVN"> + <release version="2.0.0" date="in SVN"> + <action dev="gk" type="update"> + Update to Java 17 using jakarta servlet api + </action> <action dev="painter" type="update"> Move to generics </action> diff --git a/src/java/org/apache/fulcrum/pool/BoundedBuffer.java b/src/java/org/apache/fulcrum/pool/BoundedBuffer.java index d75a268..47dcbf1 100644 --- a/src/java/org/apache/fulcrum/pool/BoundedBuffer.java +++ b/src/java/org/apache/fulcrum/pool/BoundedBuffer.java @@ -139,7 +139,7 @@ public class BoundedBuffer { --usedSlots_; @SuppressWarnings("unchecked") - T old = (T) array_[takePtr_]; + T old = (T) array_[takePtr_]; array_[takePtr_] = null; if (++takePtr_ >= array_.length) takePtr_ = 0; diff --git a/src/site/site.xml b/src/site/site.xml index c0c874c..8542d07 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -17,16 +17,60 @@ 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 Pool"> +<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 Pool" combine.self="merge"> + + <bannerRight name="Fulcrum Pool" > + <image src="https://turbine.apache.org/images/powered-by-logo.gif"; alt="Apache Turbine" position="left"/> + </bannerRight> + + <poweredBy> + <logo name="Apache Turbine" href="https://turbine.apache.org"; target="self" > + <image src="https://turbine.apache.org/images/powered-by-logo.gif"; alt="Apache Turbine" position="left"/> + </logo> + </poweredBy> + + <publishDate format="dd MMMM yyyy" position="left" /> + + <version position="left" /> + + <!-- remove if parent is upgrade to 14, and fluido-skin 2.0.0 requires doxia 2.0.0 --> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0-M11</version> + </skin> <body> + <head/> + + <links> + <item name="Apache" href="https://www.apache.org/";> </item> + <item name="Turbine" href="https://turbine.apache.org/";> </item> + <item name="Fulcrum" href="/fulcrum/"> </item> + </links> + <menu name="Overview"> <item name="Main" href="/index.html"/> </menu> + <menu ref="reports"></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-bottom</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/powered-by-logo.gif"](https://turbine.apache.org/images/powered-by-logo.gif"){kind=link}