LPS-83379 Adding tensorflow library to portal

This is because tensorflow must be in the root class loader or it will crash every time the module is redeplouyed. See spotify/scio#1137 (comment)
4lejandrito · Jul 24, 2018 · 899d1fb · 899d1fb
1 parent 1ec41d8
commit 899d1fb
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 1 deletion.
diff --git a/.classpath b/.classpath
@@ -226,6 +226,8 @@
 	<classpathentry kind="lib" path="lib/portal/juniversalchardet.jar"/>
 	<classpathentry kind="lib" path="lib/portal/jurt.jar"/>
 	<classpathentry kind="lib" path="lib/portal/kxml2.jar"/>
+	<classpathentry kind="lib" path="lib/portal/libtensorflow.jar"/>
+	<classpathentry kind="lib" path="lib/portal/libtensorflow_jni.jar"/>
 	<classpathentry kind="lib" path="lib/portal/liferay-icu4j.jar"/>
 	<classpathentry kind="lib" path="lib/portal/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/portal/log4j-extras.jar"/>
@@ -285,6 +287,7 @@
 	<classpathentry kind="lib" path="lib/portal/struts-taglib.jar"/>
 	<classpathentry kind="lib" path="lib/portal/struts-tiles.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tagsoup.jar"/>
+	<classpathentry kind="lib" path="lib/portal/tensorflow.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tika-core.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tika-parsers.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tomcat-jdbc.jar"/>

diff --git a/lib/.gitignore b/lib/.gitignore
@@ -234,6 +234,9 @@
 /portal/spring-orm.jar
 /portal/spring-oxm.jar
 /portal/spring-tx.jar
+/portal/tensorflow.jar
+/portal/libtensorflow.jar
+/portal/libtensorflow_jni.jar
 /portal/spring-web.jar
 /portal/spring-webmvc.jar
 /portal/spring-webmvc-portlet.jar
@@ -269,4 +272,4 @@
 /portal/xstream.jar
 /portal/xuggle-xuggler-noarch.jar
 /portal/xz.jar
-/portal/yui-compressor.jar
+/portal/yui-compressor.jar
diff --git a/lib/portal/dependencies.properties b/lib/portal/dependencies.properties
@@ -106,6 +106,8 @@ juh=org.openoffice:juh:2.3.1
 juniversalchardet=com.googlecode.juniversalchardet:juniversalchardet:1.0.3
 jurt=org.openoffice:jurt:2.3.1
 kxml2=net.sf.kxml:kxml2:2.3.0
+libtensorflow=org.tensorflow:libtensorflow:1.8.0
+libtensorflow_jni=org.tensorflow:libtensorflow_jni:1.8.0
 liferay-icu4j=com.liferay:com.ibm.icu4j:54.1.1.LIFERAY-PATCHED-2
 log4j-extras=log4j:apache-log4j-extras:1.2.17
 log4j=log4j:log4j:1.2.17
@@ -164,6 +166,7 @@ struts-extras=org.apache.struts:struts-extras:1.3.10
 struts-taglib=org.apache.struts:struts-taglib:1.3.10
 struts-tiles=org.apache.struts:struts-tiles:1.3.10
 tagsoup=org.ccil.cowan.tagsoup:tagsoup:1.2.1
+tensorflow=org.tensorflow:tensorflow:1.8.0
 tika-core=org.apache.tika:tika-core:1.14
 tika-parsers=org.apache.tika:tika-parsers:1.14
 tomcat-jdbc=org.apache.tomcat:tomcat-jdbc:9.0.6

diff --git a/lib/versions-ext.xml b/lib/versions-ext.xml
@@ -2302,6 +2302,36 @@
 					See LPS-24702.
 				</comments>
 			</library>
+			<library>
+				<file-name>lib/portal/libtensorflow.jar</file-name>
+				<version>1.8.0</version>
+				<project-name>Tensorflow</project-name>
+				<project-url>https://www.tensorflow.org/</project-url>
+				<licenses>
+					<license>
+						<license-name>Apache License 2.0</license-name>
+						<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
+					</license>
+				</licenses>
+				<comments>
+					See LPS-83379.
+				</comments>
+			</library>
+			<library>
+				<file-name>lib/portal/libtensorflow_jni.jar</file-name>
+				<version>1.8.0</version>
+				<project-name>Tensorflow</project-name>
+				<project-url>https://www.tensorflow.org/</project-url>
+				<licenses>
+					<license>
+						<license-name>Apache License 2.0</license-name>
+						<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
+					</license>
+				</licenses>
+				<comments>
+					See LPS-83379.
+				</comments>
+			</library>
 			<library>
 				<file-name>lib/portal/liferay-icu4j.jar</file-name>
 				<version>54.1.1.LIFERAY-PATCHED-1</version>
@@ -3078,6 +3108,21 @@
 					</license>
 				</licenses>
 			</library>
+			<library>
+				<file-name>lib/portal/tensorflow.jar</file-name>
+				<version>1.8.0</version>
+				<project-name>Tensorflow</project-name>
+				<project-url>https://www.tensorflow.org/</project-url>
+				<licenses>
+					<license>
+						<license-name>Apache License 2.0</license-name>
+						<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
+					</license>
+				</licenses>
+				<comments>
+					See LPS-83379.
+				</comments>
+			</library>
 			<library>
 				<file-name>lib/portal/tika-core.jar</file-name>
 				<version>1.10</version>

diff --git a/modules/core/portal-bootstrap/system.packages.extra.bnd b/modules/core/portal-bootstrap/system.packages.extra.bnd
@@ -337,6 +337,8 @@ Provide-Capability:\
 	@../../../lib/portal/jodd-servlet.jar,\
 	@../../../lib/portal/jodd-upload.jar,\
 	@../../../lib/portal/json-java.jar,\
+	@../../../lib/portal/libtensorflow.jar,\
+	@../../../lib/portal/libtensorflow_jni.jar,\
 	@../../../lib/portal/liferay-icu4j.jar,\
 	@../../../lib/portal/log4j-extras.jar,\
 	@../../../lib/portal/log4j.jar,\
@@ -361,6 +363,7 @@ Provide-Capability:\
 	@../../../lib/portal/struts-extras.jar,\
 	@../../../lib/portal/struts-taglib.jar,\
 	@../../../lib/portal/struts-tiles.jar,\
+	@../../../lib/portal/tensorflow.jar,\
 	@../../../lib/portal/tika-core.jar,\
 	@../../../lib/portal/tika-parsers.jar,\
 	@../../../lib/portal/xalan.jar,\

diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -191,6 +191,8 @@ javac.classpath=\
     lib/portal/juniversalchardet.jar:\
     lib/portal/jurt.jar:\
     lib/portal/kxml2.jar:\
+    lib/portal/libtensorflow.jar:\
+    lib/portal/libtensorflow_jni.jar:\
     lib/portal/liferay-icu4j.jar:\
     lib/portal/log4j.jar:\
     lib/portal/log4j-extras.jar:\
@@ -250,6 +252,7 @@ javac.classpath=\
     lib/portal/struts-taglib.jar:\
     lib/portal/struts-tiles.jar:\
     lib/portal/tagsoup.jar:\
+    lib/portal/tensorflow.jar:\
     lib/portal/tika-core.jar:\
     lib/portal/tika-parsers.jar:\
     lib/portal/tomcat-jdbc.jar:\