Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3

Author: lkshminarayanan

mysql-test/suite/ndb/include/have_clusterj_jpa.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,11 +15,6 @@
 
 MESSAGE(STATUS "including ClusterJ")
 
-IF("${WITH_CLASSPATH}" MATCHES "openjpa-(.+).jar")
-  MESSAGE ( STATUS "Found openjpa jar" )
-  SET(HAVE_OPENJPA TRUE)
-ENDIF()
-
 SET(DEP ndbjtie.jar
         jtie.jar
         clusterj-api.jar
@@ -36,16 +31,7 @@ ADD_SUBDIRECTORY(clusterj-api)
 ADD_SUBDIRECTORY(clusterj-core)
 ADD_SUBDIRECTORY(clusterj-tie)
 
-IF(HAVE_OPENJPA)
-  ADD_SUBDIRECTORY(clusterj-openjpa)
-  LIST(APPEND DEP clusterjpa.jar)
-  LIST(APPEND JARS ${CMAKE_CURRENT_BINARY_DIR}/clusterj-openjpa/clusterjpa.jar)
-ENDIF(HAVE_OPENJPA)
-
-  ADD_SUBDIRECTORY(clusterj-test)
-  IF(HAVE_OPENJPA)
-    ADD_SUBDIRECTORY(clusterj-jpatest)
-  ENDIF(HAVE_OPENJPA)
+ADD_SUBDIRECTORY(clusterj-test)
 
 SET(CLUSTERJ_EXPORTS com.mysql.clusterj,com.mysql.clusterj.query,com.mysql.clusterj.annotation,com.mysql.clusterj.metadata,com.mysql.clusterj.spi,com.mysql.clusterj.store,com.mysql.clusterj.util,com.mysql.clusterj.tie)
 CREATE_MANIFEST(clusterj_manifest.mf ${CLUSTERJ_EXPORTS} clusterj)
@@ -59,7 +45,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)
 
 # create maven pom.xml in all subdirectories
-SET(CLUSTERJ_PROJECTS api core jdbc jpatest openjpa test tie unit)
+SET(CLUSTERJ_PROJECTS api core test tie unit)
 
 IF(WIN32)