Merge missed changes to build 113 (made on 15th)
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 27f268d..e90e9e5 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.112",
- javax.persistence.criteria;jpa="2.0";version="2.0.112",
- javax.persistence.metamodel;jpa="2.0";version="2.0.112",
- javax.persistence.spi;jpa="2.0";version="2.0.112",
+Export-Package: javax.persistence;jpa="2.0";version="2.0.113",
+ javax.persistence.criteria;jpa="2.0";version="2.0.113",
+ javax.persistence.metamodel;jpa="2.0";version="2.0.113",
+ javax.persistence.spi;jpa="2.0";version="2.0.113",
org.osgi.service.jpa;version="1.0.100"
-Implementation-Version: 2.0.112
+Implementation-Version: 2.0.113
Bundle-ClassPath: .
Specification-Vendor: Oracle
Bundle-Name: Java Persistence API 2.1 preview
@@ -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.112.qualifier
+Bundle-Version: 2.0.113.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.persistence.javax.persistence.osgi.Activator
Import-Package: javax.sql;resolution:=optional,
diff --git a/pom.xml b/pom.xml
index c4f7487..026b115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<name>JPA Spec OSGi Bundle</name>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
- <version>2.0.112-SNAPSHOT</version>
+ <version>2.0.113-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.17.0</tycho.version>
- <release.version>2.0.112</release.version>
+ <release.version>2.0.113</release.version>
<build.qualifier>v${maven.build.timestamp}</build.qualifier>
<forceContextQualifier>${build.qualifier}</forceContextQualifier>
<!-- BUILD Properties -->
diff --git a/resource/about.html b/resource/about.html
index 57a65d3..b177716 100644
--- a/resource/about.html
+++ b/resource/about.html
@@ -3,10 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About JPA 2.1.0 Draft</title>
+<title>About JPA 2.1 Draft</title>
</head>
<body lang="EN-US">
-<h1>JPA 2.1.0 Draft</h1>
+<h1>JPA 2.1 Draft</h1>
<h2>License </h2>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content").
@@ -29,9 +29,9 @@
out below. If you did not receive this Content directly from the Eclipse Foundation,
the following is provided for informational purposes only, and you should look
to the Redistributor’s license for terms and conditions of use.</p>
-<h3><a name="JPA21" id="JPA2"></a>Java Persistence (JPA) 2.1.0 </h3>
+<h3><a name="JPA21" id="JPA2"></a>Java Persistence (JPA) 2.1 </h3>
<blockquote>
- <p>EclipseLink is the Java Persistence (JPA) 2.1.0 Reference Implementation
+ <p>EclipseLink is the Java Persistence (JPA) 2.1 Reference Implementation
(<a href="http://jcp.org/en/jsr/detail?id=338">JSR 338</a>). The JPA 2.1 Draft
specification API is included in EclipseLink under the <a href="http://www.eclipse.org/legal/epl-v10.html">EPL</a> and <a href="http://www.eclipse.org/org/documents/edl-v10.php">EDL</a> licenses.</p>
</blockquote>
