merge

liferay-plugins-sdk-6.2/build.portos.properties

@@ -1,5 +1,7 @@
 # Managed by Liferay IDE (remove this comment to prevent future updates)
 
+#required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-taglib.jar
+
 app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
 app.server.tomcat.deploy.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
 app.server.parent.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6

liferay-plugins-sdk-6.2/build.properties

@@ -337,7 +337,7 @@
     ivy.custom.settings.file=${sdk.dir}/ivy-settings.xml
     ivy.home=${sdk.dir}/.ivy
 
-    #ivy.jar.url=http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
+    #ivy.jar.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
     ivy.jar.url=https://cdn.lfrs.sl/repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/org.apache.ivy/${ivy.version}/org.apache.ivy-${ivy.version}.jar
 
     ivy.log.level=quiet
@@ -391,7 +391,8 @@
 ## Libraries
 ##
 
-    required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar
+    #required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar
+    required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-taglib.jar
 
 ##
 ## Liferay Home

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -11,14 +11,9 @@ licenses=LGPL
 liferay-versions=6.2.0+
 portal-dependency-jars=\
     axis.jar,\
-    commons-discovery.jar,\
-    commons-io.jar,\
-    commons-lang.jar,\
-    httpclient.jar,\
     jaxrpc.jar,\
     jstl-api.jar,\
     jstl-impl.jar,\
-    util-java.jar,\
     wsdl4j.jar,\
     xml-apis.jar
 portal-dependency-tlds=\

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java

@@ -1,7 +1,5 @@
 package it.mwg.sismica.bo.util;
 
-import java.io.IOException;
-
 import flexjson.JSONSerializer;
 import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java

@@ -117,7 +117,7 @@ public class SismicaUtil {
 	public static Date[] getWeekInterval(int dow) {
 		return getWeekInterval(dow, Calendar.getInstance().getTime());
 	}
-
+	
 	public static Date[] getWeekInterval(int dow, Date base) {
 		Calendar reference = Calendar.getInstance();
 		reference.setTime(base);

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2489
+    build.number=2503
-    build.date=1603181114662
+    build.date=1603196576566
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml

@@ -15,6 +15,13 @@
 		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
 		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0" />
 		
-		<dependency conf="*->default" name="jettison" org="org.codehaus.jettison" rev="1.3.8"/>
+		<dependency name="commons-codec" org="commons-codec" rev="1.10"/>
+		<dependency name="commons-csv" org="org.apache.commons" rev="1.4"/>
+		<dependency name="commons-io" org="commons-io" rev="2.6"/>
+		<dependency name="commons-lang" org="commons-lang" rev="2.6"/>
+		<dependency name="flexjson" org="net.sf.flexjson" rev="3.1"/>
+		<dependency name="httpclient" org="org.apache.httpcomponents" rev="4.5"/>
+		<dependency name="httpmime" org="org.apache.httpcomponents" rev="4.5"/>
+		<dependency name="jettison" org="org.codehaus.jettison" rev="1.3.8"/>
 	</dependencies>
 </ivy-module>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5

@@ -1 +1 @@
-cbfd9c1238d270cd34364cf64600e5a4
+291fbe4be1f094ebfa7c95b6381ba6af

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -12,8 +12,10 @@ liferay-versions=6.2.0+
 portal-dependency-jars=\
     jstl-api.jar,\
     jstl-impl.jar,\
-    commons-io.jar,\
+    commons-beanutils.jar,\
     commons-codec.jar,\
+    commons-digester.jar,\
+    commons-io.jar,\
     commons-lang.jar,\
     commons-collections.jar
 portal-dependency-tlds=\

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml

@@ -11,8 +11,14 @@
 	</info>
 
 	<dependencies defaultconf="default">
-		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final"/>
-		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6"/>
-		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0"/>
+
+		<dependency name="httpclient" org="org.apache.httpcomponents" rev="4.5"/>
+		<dependency name="httpmime" org="org.apache.httpcomponents" rev="4.5"/>
+		<dependency name="jasperreports" org="net.sf.jasperreports" rev="5.0.0"/>
+		<dependency name="jasperreports-fonts" org="net.sf.jasperreports" rev="5.0.0"/>
+		<dependency name="jOpenDocument" org="org.jopendocument" rev="1.3"/>
 	</dependencies>
 </ivy-module>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5

@@ -1 +1 @@
-e06b82dc0c33b2acbc1b260acdbf8b8c
+8ac2501ca718b6e57f0038572748dfb3