Fix issue with incorrect apostrophe in javadoc that caused javadoc failure on recent java versions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 4bbed63..695484e 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
-Export-Package: javax.persistence;jpa="2.0";version="2.0.5",
- javax.persistence.criteria;jpa="2.0";version="2.0.5",
- javax.persistence.metamodel;jpa="2.0";version="2.0.5",
- javax.persistence.spi;jpa="2.0";version="2.0.5",
+Export-Package: javax.persistence;jpa="2.0";version="2.0.6",
+ javax.persistence.criteria;jpa="2.0";version="2.0.6",
+ javax.persistence.metamodel;jpa="2.0";version="2.0.6",
+ javax.persistence.spi;jpa="2.0";version="2.0.6",
org.osgi.service.jpa;version="1.0.0"
-Implementation-Version: 2.0.5
+Implementation-Version: 2.0.6
Bundle-ClassPath: .
Specification-Vendor: Sun Microsystems Inc.
Bundle-Name: Java Persistence API 2.0
@@ -12,7 +12,7 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Implementation-Vendor: Eclipse.org - EclipseLink Project
Bundle-Vendor: Eclipse.org - EclipseLink Project
-Bundle-Version: 2.0.5.qualifier
+Bundle-Version: 2.0.6.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.persistence.javax.persistence.osgi.Activator
Import-Package: javax.sql;resolution:=optional,
diff --git a/antbuild.xml b/antbuild.xml
index 9f048ef..3cf01ed 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -59,7 +59,7 @@
<property name="jpaproto.spec.vendor" value="Sun Microsystems Inc."/>
<property name="implementation.vendor" value="Eclipse.org - EclipseLink Project"/>
<property name="jpaproto.spec.version" value="2.0"/>
- <property name="jpaproto.version" value="2.0.5"/>
+ <property name="jpaproto.version" value="2.0.6"/>
<property name="jpaproto.osgi.service.version" value="1.0.0"/>
<property name="jpaproto.bundle.name" value="Java Persistence API 2.0"/>
<!-- Project infrastructure properties -->
@@ -167,7 +167,7 @@
destdir="${classes.dir}"
includes="**"
debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
+
encoding="UTF-8"
optimize="${javac.optimize}"
source="${javac.version}"
diff --git a/pom.xml b/pom.xml
index c5d5c5e..57b1d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<name>JPA Spec OSGi Bundle</name>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
- <version>2.0.5-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<!-- tycho requires maven >= 3.0 -->
@@ -18,7 +18,7 @@
<!-- TOOL Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.16.0</tycho.version>
- <release.version>2.0.5</release.version>
+ <release.version>2.0.6</release.version>
<build.qualifier>v${maven.build.timestamp}</build.qualifier>
<forceContextQualifier>${build.qualifier}</forceContextQualifier>
<!-- BUILD Properties -->
diff --git a/src/javax/persistence/EntityManager.java b/src/javax/persistence/EntityManager.java
index b3293ad..94aec2c 100644
--- a/src/javax/persistence/EntityManager.java
+++ b/src/javax/persistence/EntityManager.java
@@ -101,7 +101,7 @@
* not exist
* @throws IllegalArgumentException if the first argument does
* not denote an entity type or the second argument is
- * is not a valid type for that entitys primary key or
+ * is not a valid type for that entity's primary key or
* is null
*/
public <T> T find(Class<T> entityClass, Object primaryKey);
@@ -121,7 +121,7 @@
* not exist
* @throws IllegalArgumentException if the first argument does
* not denote an entity type or the second argument is
- * is not a valid type for that entitys primary key or
+ * is not a valid type for that entity's primary key or
* is null
* @since Java Persistence 2.0
*/
@@ -242,7 +242,7 @@
* @return the found entity instance
* @throws IllegalArgumentException if the first argument does
* not denote an entity type or the second argument is
- * not a valid type for that entitys primary key or
+ * not a valid type for that entity's primary key or
* is null
* @throws EntityNotFoundException if the entity state
* cannot be accessed
diff --git a/src/javax/persistence/MapsId.java b/src/javax/persistence/MapsId.java
index 571a119..86b6699 100644
--- a/src/javax/persistence/MapsId.java
+++ b/src/javax/persistence/MapsId.java
@@ -70,7 +70,7 @@
/**
* (Optional) The name of the attribute within the composite key
* to which the relationship attribute corresponds. If not
- * supplied, the relationship maps the entitys primary
+ * supplied, the relationship maps the entity's primary
* key.
*/
String value() default ""; }
