This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9c40886b Revert to 6.0-SNAPSHOT, add missing license headers to java
files, fix rat report generation by manually updating version from 0.14 to 0.15
and add configuration to rat plugin
9c40886b is described below
commit 9c40886bf1d766588ad3e533dac585e29c273081
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Jan 22 17:36:09 2024 +0100
Revert to 6.0-SNAPSHOT, add missing license headers to java files, fix rat
report generation by manually updating version from 0.14 to 0.15 and add
configuration to rat plugin
---
pom.xml | 32 +++++++++++++++++++++-
src/changes/changes.xml | 2 +-
.../localization/DateTimeFormatterInterface.java | 19 +++++++++++++
.../localization/DateTimeFormatterService.java | 19 +++++++++++++
.../localization/RundataLocalizationInterface.java | 19 +++++++++++++
.../localization/RundataLocalizationService.java | 19 +++++++++++++
6 files changed, 108 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb1bfb7b..62d00302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>turbine</artifactId>
<name>Apache Turbine</name>
- <version>6.1-SNAPSHOT</version>
+ <version>6.0-SNAPSHOT</version>
<description>Turbine is a servlet based framework that allows experienced
Java
developers to quickly build secure web applications. Parts of Turbine
can also be used independently of the web portion of Turbine as
@@ -529,6 +529,21 @@
<artifactId>torque-maven-plugin</artifactId>
<version>${torque.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.15</version>
+ <configuration>
+ <excludes>
+ <exclude>xdocs/images/*</exclude>
+ <exclude>src/site/**</exclude>
+ <exclude>proposals/**</exclude>
+ <exclude>extensions/**</exclude>
+ <exclude>conf/**</exclude>
+ <exclude>README.md</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -856,6 +871,12 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <!-- check the Apache Licence in all source files -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.15</version>
+ </plugin>
</plugins>
</reporting>
@@ -1158,6 +1179,15 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <reportPlugins>
+ <reportPlugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.15</version>
+ </reportPlugin>
+ </reportPlugins>
+ </configuration>
</plugin>
<plugin>
<!-- build the source and binary distribution packages -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4a626835..98139f9b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
</properties>
<body>
- <release version="5.2-SNAPSHOT" date="in Git">
+ <release version="6.0-SNAPSHOT" date="in Git">
<action type="add" dev="gk">
Provide mechanism to allow auto loading of Turbine (and Fulcrum)
services. If a "known" service is extending FieldAnnotatedTurbineBaseService or
MethodAnnotatedTurbineBaseService it could declare fields and methods
with more Turbine annotations.
diff --git
a/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java
b/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java
index cf3bfab9..73747e1f 100644
---
a/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java
+++
b/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java
@@ -1,5 +1,24 @@
package org.apache.turbine.services.localization;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
diff --git
a/src/java/org/apache/turbine/services/localization/DateTimeFormatterService.java
b/src/java/org/apache/turbine/services/localization/DateTimeFormatterService.java
index f6416cfd..17199e3c 100644
---
a/src/java/org/apache/turbine/services/localization/DateTimeFormatterService.java
+++
b/src/java/org/apache/turbine/services/localization/DateTimeFormatterService.java
@@ -1,5 +1,24 @@
package org.apache.turbine.services.localization;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import java.time.DateTimeException;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
diff --git
a/src/java/org/apache/turbine/services/localization/RundataLocalizationInterface.java
b/src/java/org/apache/turbine/services/localization/RundataLocalizationInterface.java
index 7e744e31..ab1bb87a 100644
---
a/src/java/org/apache/turbine/services/localization/RundataLocalizationInterface.java
+++
b/src/java/org/apache/turbine/services/localization/RundataLocalizationInterface.java
@@ -1,5 +1,24 @@
package org.apache.turbine.services.localization;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import java.io.Serializable;
import java.util.Locale;
diff --git
a/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
b/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
index f174e11b..bcb37d66 100644
---
a/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
+++
b/src/java/org/apache/turbine/services/localization/RundataLocalizationService.java
@@ -1,5 +1,24 @@
package org.apache.turbine.services.localization;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
import java.util.Locale;
import org.apache.fulcrum.localization.DefaultLocalizationService;
