You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2021/05/28 23:04:10 UTC
[db-jdo] branch jdo-709-specification updated: merge master (#21)
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch jdo-709-specification
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
The following commit(s) were added to refs/heads/jdo-709-specification by this push:
new 225e405 merge master (#21)
225e405 is described below
commit 225e405b84dc9dcb9b9ed0839c2485a8e8436803
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Fri May 28 16:04:03 2021 -0700
merge master (#21)
* JDO-794: Remove @Persistent field annotation in PCRectStringAnnotated
* Accepted previous specification changes
Co-authored-by: Michael Bouschen <mb...@apache.org>
---
specification/OOO/Ch06-PersistentObjectModel.odt | Bin 40218 -> 33382 bytes
specification/OOO/Ch18-XMLMetadata.odt | Bin 47875 -> 61842 bytes
specification/OOO/Ch19-Annotations_MetadataAPI.odt | Bin 71357 -> 58049 bytes
tck/pom.xml | 2 +-
.../jdo/tck/pc/mylib/PCRectStringAnnotated.java | 2 --
5 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/specification/OOO/Ch06-PersistentObjectModel.odt b/specification/OOO/Ch06-PersistentObjectModel.odt
index 67fe34f..cba4eb3 100644
Binary files a/specification/OOO/Ch06-PersistentObjectModel.odt and b/specification/OOO/Ch06-PersistentObjectModel.odt differ
diff --git a/specification/OOO/Ch18-XMLMetadata.odt b/specification/OOO/Ch18-XMLMetadata.odt
index 7cc72b3..9b71d20 100644
Binary files a/specification/OOO/Ch18-XMLMetadata.odt and b/specification/OOO/Ch18-XMLMetadata.odt differ
diff --git a/specification/OOO/Ch19-Annotations_MetadataAPI.odt b/specification/OOO/Ch19-Annotations_MetadataAPI.odt
index b1b112a..1b8df71 100644
Binary files a/specification/OOO/Ch19-Annotations_MetadataAPI.odt and b/specification/OOO/Ch19-Annotations_MetadataAPI.odt differ
diff --git a/tck/pom.xml b/tck/pom.xml
index 0dfa0e2..4dc5e0e 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -203,7 +203,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
- <version>5.2.6</version>
+ <version>5.2.7</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRectStringAnnotated.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRectStringAnnotated.java
index ec177c1..ec627b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRectStringAnnotated.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/PCRectStringAnnotated.java
@@ -39,12 +39,10 @@ public class PCRectStringAnnotated implements IPCRect {
@Column(name="ID")
private long id = newId();
- @Persistent
@Column(name="UPPER_LEFT")
@Convert(value = PointToStringConverter.class)
private Point upperLeft;
- @Persistent
@Column(name="LOWER_RIGHT")
@Convert(value = PointToStringConverter.class)
private Point lowerRight;