From 899d1fba2ba6ed5565885fe017e0723daf2fc65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Tard=C3=ADn?= Date: Wed, 11 Jul 2018 16:49:17 +0200 Subject: [PATCH] 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 https://github.com/spotify/scio/issues/1137#issuecomment-390226271 --- .classpath | 3 ++ lib/.gitignore | 5 ++- lib/portal/dependencies.properties | 3 ++ lib/versions-ext.xml | 45 +++++++++++++++++++ .../system.packages.extra.bnd | 3 ++ nbproject/project.properties | 3 ++ 6 files changed, 61 insertions(+), 1 deletion(-) diff --git a/.classpath b/.classpath index 5b86f2675404eb..84132ed3a18b0e 100644 --- a/.classpath +++ b/.classpath @@ -226,6 +226,8 @@ + + @@ -285,6 +287,7 @@ + diff --git a/lib/.gitignore b/lib/.gitignore index 8079343d85a2e5..2036b8db5ce97a 100644 --- 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 \ No newline at end of file +/portal/yui-compressor.jar diff --git a/lib/portal/dependencies.properties b/lib/portal/dependencies.properties index a1440449587884..43084fe275953b 100644 --- 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 index 16851bb83d5966..da2ec6e58e7bc9 100644 --- a/lib/versions-ext.xml +++ b/lib/versions-ext.xml @@ -2302,6 +2302,36 @@ See LPS-24702. + + lib/portal/libtensorflow.jar + 1.8.0 + Tensorflow + https://www.tensorflow.org/ + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + See LPS-83379. + + + + lib/portal/libtensorflow_jni.jar + 1.8.0 + Tensorflow + https://www.tensorflow.org/ + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + See LPS-83379. + + lib/portal/liferay-icu4j.jar 54.1.1.LIFERAY-PATCHED-1 @@ -3078,6 +3108,21 @@ + + lib/portal/tensorflow.jar + 1.8.0 + Tensorflow + https://www.tensorflow.org/ + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + See LPS-83379. + + lib/portal/tika-core.jar 1.10 diff --git a/modules/core/portal-bootstrap/system.packages.extra.bnd b/modules/core/portal-bootstrap/system.packages.extra.bnd index b8448e34bdf1ca..b11d552a698dc7 100644 --- 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 index a8b0c4bc959463..76884bde3287a9 100644 --- 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:\