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 2023/06/08 08:30:06 UTC
[turbine-fulcrum-intake] annotated tag fulcrum-intake-2.0.1-candidate created (now 32f39f68)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to annotated tag fulcrum-intake-2.0.1-candidate
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
at 32f39f68 (tag)
tagging 17a268cac26bdb79b9cfd35a4008baad0dbeb9e3 (commit)
by Georg Kallidis
on Thu Jun 8 10:28:59 2023 +0200
- Log -----------------------------------------------------------------
[maven-release-plugin] copy for tag fulcrum-intake-2.0.1-candidate
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new c77d1eac Update to jakarta binding (outside jdk) with java 11
new 17a268ca [maven-release-plugin] prepare release fulcrum-intake-2.0.1-candidate
The 2 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.
[turbine-fulcrum-intake] 01/02: Update to jakarta binding (outside jdk) with java 11
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to annotated tag fulcrum-intake-2.0.1-candidate
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit c77d1eac26d620b48be9b914c3fa03cd4bdff974
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Mar 6 11:40:25 2023 +0100
Update to jakarta binding (outside jdk) with java 11
---
pom.xml | 6 ++----
src/changes/changes.xml | 7 +++++--
.../org/apache/fulcrum/intake/IntakeServiceImpl.java | 9 +++++----
src/java/org/apache/fulcrum/intake/model/AppData.java | 12 ++++++------
.../org/apache/fulcrum/intake/model/FieldAdapter.java | 3 ++-
.../org/apache/fulcrum/intake/model/FieldType.java | 5 +++--
src/java/org/apache/fulcrum/intake/model/Group.java | 18 +++++++++---------
src/java/org/apache/fulcrum/intake/model/Rule.java | 12 ++++++------
src/java/org/apache/fulcrum/intake/model/XmlField.java | 14 +++++++-------
.../org/apache/fulcrum/intake/model/package-info.java | 4 ++--
10 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8ef9c42f..cfef288f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,16 +88,14 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.3</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.3</version>
+ <version>4.0.2</version>
<scope>runtime</scope>
</dependency>
-
-
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3227f381..2b8ba372 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,8 +25,11 @@
</properties>
<body>
- <release version="2.0.1" date="in Subversion">
- <action dev="gk" type="update">
+ <release version="2.0.1" date="in Git">
+ <action dev="gk" type="update">
+ Update package / namespace for JAXB binding from jaxb to jakarta parsing with Java 11.
+ </action>
+ <action dev="gk" type="update">
Update dependencies testcontainer 1.0.9 (inherits junit)
</action>
<action dev="painter" type="update">
diff --git a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
index 0095c3b1..85e6b68f 100644
--- a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
+++ b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
@@ -39,10 +39,6 @@ import java.util.Map.Entry;
import java.util.Set;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.Unmarshaller.Listener;
-import javax.xml.bind.helpers.DefaultValidationEventHandler;
import javax.xml.validation.SchemaFactory;
import org.apache.avalon.framework.activity.Initializable;
@@ -65,6 +61,11 @@ import org.apache.fulcrum.intake.model.AppData;
import org.apache.fulcrum.intake.model.Field;
import org.apache.fulcrum.intake.model.Group;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller.Listener;
+import jakarta.xml.bind.helpers.DefaultValidationEventHandler;
+
/**
* This service provides access to input processing objects based on an XML
* specification.
diff --git a/src/java/org/apache/fulcrum/intake/model/AppData.java b/src/java/org/apache/fulcrum/intake/model/AppData.java
index cfd199cf..0960b7c7 100644
--- a/src/java/org/apache/fulcrum/intake/model/AppData.java
+++ b/src/java/org/apache/fulcrum/intake/model/AppData.java
@@ -23,14 +23,14 @@ import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.fulcrum.intake.IntakeException;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
/**
* A class for holding application data structures.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java b/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
index 480c14dc..6e743d13 100644
--- a/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
+++ b/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
@@ -19,10 +19,11 @@ package org.apache.fulcrum.intake.model;
* under the License.
*/
-import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.fulcrum.intake.IntakeException;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
/**
* Creates Field objects.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/FieldType.java b/src/java/org/apache/fulcrum/intake/model/FieldType.java
index bb8503f8..2e9fac88 100644
--- a/src/java/org/apache/fulcrum/intake/model/FieldType.java
+++ b/src/java/org/apache/fulcrum/intake/model/FieldType.java
@@ -22,11 +22,12 @@ package org.apache.fulcrum.intake.model;
import java.io.Serializable;
import java.lang.reflect.Constructor;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
import org.apache.fulcrum.intake.IntakeException;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+
/**
* Enum for valid field types.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/Group.java b/src/java/org/apache/fulcrum/intake/model/Group.java
index 91db4434..bfd027d7 100644
--- a/src/java/org/apache/fulcrum/intake/model/Group.java
+++ b/src/java/org/apache/fulcrum/intake/model/Group.java
@@ -27,14 +27,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.lang3.StringUtils;
@@ -46,6 +38,14 @@ import org.apache.fulcrum.intake.IntakeServiceFacade;
import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.parser.ValueParser;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
/**
* Holds a group of Fields
*
@@ -651,7 +651,7 @@ public class Group implements Serializable, LogEnabled
}
/**
- * JAXB callback to set the parent object
+ * JAXB / Jakarta callback to set the parent object
*
* @param um the Unmarshaller
* @param parent the parent object (an AppData object)
diff --git a/src/java/org/apache/fulcrum/intake/model/Rule.java b/src/java/org/apache/fulcrum/intake/model/Rule.java
index eb6b2bda..7a97dbce 100644
--- a/src/java/org/apache/fulcrum/intake/model/Rule.java
+++ b/src/java/org/apache/fulcrum/intake/model/Rule.java
@@ -21,14 +21,14 @@ package org.apache.fulcrum.intake.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
import org.apache.fulcrum.intake.validator.Constraint;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
+
/**
* A Class for holding data about a constraint on a property.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/XmlField.java b/src/java/org/apache/fulcrum/intake/model/XmlField.java
index 0de03491..786cf863 100644
--- a/src/java/org/apache/fulcrum/intake/model/XmlField.java
+++ b/src/java/org/apache/fulcrum/intake/model/XmlField.java
@@ -28,17 +28,17 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.lang3.StringUtils;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
/**
* A Class for holding data about a property used in an Application.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/package-info.java b/src/java/org/apache/fulcrum/intake/model/package-info.java
index 3b1f733b..66bf713c 100644
--- a/src/java/org/apache/fulcrum/intake/model/package-info.java
+++ b/src/java/org/apache/fulcrum/intake/model/package-info.java
@@ -1,6 +1,6 @@
-@javax.xml.bind.annotation.XmlSchema(
+@jakarta.xml.bind.annotation.XmlSchema(
namespace = "http://turbine.apache.org/schema/intake/4.0",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.fulcrum.intake.model;
[turbine-fulcrum-intake] 02/02: [maven-release-plugin] prepare release fulcrum-intake-2.0.1-candidate
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to annotated tag fulcrum-intake-2.0.1-candidate
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit 17a268cac26bdb79b9cfd35a4008baad0dbeb9e3
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Thu Jun 8 10:23:57 2023 +0200
[maven-release-plugin] prepare release fulcrum-intake-2.0.1-candidate
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cfef288f..89f7b482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>12-SNAPSHOT</version>
- <relativePath/>
+ <version>12</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<name>Fulcrum Intake Service</name>
<inceptionYear>2005</inceptionYear>
<description>This Service provides rule-based input validation</description>
@@ -46,7 +46,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git</developerConnection>
<url>https://github.com/apache/${turbine.site.path}/tree/${project.scm.tag}</url>
- <tag>HEAD</tag>
+ <tag>fulcrum-intake-2.0.1-candidate</tag>
</scm>
<developers>