Merge branch 'bug/JUDDI-937'
diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml
index cf396bb..66ba65c 100644
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>3.1.0</version>
<configuration>
<includes>**/org/apache/juddi/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>3.1.0</version>
</dependency>
</dependencies>
</plugin>
diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml
index 810f80c..4059298 100644
--- a/juddiv3-war/pom.xml
+++ b/juddiv3-war/pom.xml
@@ -328,11 +328,7 @@
<artifactId>jettison</artifactId>
</dependency>
<!--END added AO 6/8/2013 support for JSON encoding on REST endpoints -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index dc43db7..a403122 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -15,7 +15,7 @@
- UDDI Specification version [3.0.2](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm) compliant
- UDDI Specification version [2.0.4](http://uddi.org/pubs/ProgrammersAPI-V2.04-Published-20020719.htm) interoperability services (BETA)
- - JDK 1.6 Recommended
+ - JDK 1.8 Recommended
- Built on [JAXB](https://jcp.org/en/jsr/detail?id=222) and [JAX-WS](https://jcp.org/en/jsr/detail?id=224) standardized interfaces, tested on [Apache CXF](http://cxf.apache.org)
- Built on JPA standardized interfaces, tested with [Apache OpenJPA](http://openjpa.apache.org/) and [Hibernate](http://hibernate.org/)
- Pre-configured bundle deployed to [Apache Tomcat](http://tomcat.apache.org/)
diff --git a/src/site/markdown/integration.md b/src/site/markdown/integration.md
index 3325741..9d523bd 100644
--- a/src/site/markdown/integration.md
+++ b/src/site/markdown/integration.md
@@ -12,8 +12,8 @@
| JPA Provider | JDK | Operating System | .NET Runtime | Application Container | SOAP Framework |
| --- | --- | --- | --- | --- | --- |
-| OpenJPA | OpenJDK 6 | Ubuntu | Microsoft.NET 3.5 | Apache Tomcat 6.x | Apache CXF |
-| Hibernate | Oracle JDK 6 | Windows 7 | Mono 3.x | Apache Tomcat 6.x | .NET WCF, .NET ASP.NET |
+| OpenJPA | OpenJDK 8 | Ubuntu | Microsoft.NET 3.5 | Apache Tomcat 9.x | Apache CXF |
+| Hibernate | Oracle JDK 8 | Windows 7 | Mono 3.x | Apache Tomcat 9.x | .NET WCF, .NET ASP.NET |
## Access