You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/08 08:24:11 UTC
openmeetings git commit: [OPENMEETINGS-1738] build warnings are fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x a1d8dd689 -> d41832b13
[OPENMEETINGS-1738] build warnings are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d41832b1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d41832b1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d41832b1
Branch: refs/heads/4.0.x
Commit: d41832b1355598e0494768e930ea01c120ea6249
Parents: a1d8dd6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 8 15:24:03 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 8 15:24:03 2017 +0700
----------------------------------------------------------------------
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/src/main/assembly/components/all.xml | 2 ++
openmeetings-server/src/site/stylesheets/configs.xsl | 2 +-
openmeetings-server/src/site/stylesheets/errortable.xsl | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d41832b1/openmeetings-screenshare/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 4e74742..0673f21 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -33,7 +33,7 @@
<keystore.location>${project.build.directory}/screensharing_sign.keystore</keystore.location>
<key.password>secret</key.password>
<keystore.password>secret</keystore.password>
- <keystore.type>jks</keystore.type>
+ <keystore.type>pkcs12</keystore.type>
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d41832b1/openmeetings-server/src/main/assembly/components/all.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml
index 1bc3b4c..d8a13d8 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -34,6 +34,7 @@
<exclude>webapps/root/favicon.ico</exclude>
<exclude>webapps/root/index.html</exclude>
<exclude>lib/commons-io*.jar</exclude>
+ <exclude>lib/commons-lang3*</exclude>
<exclude>lib/spring*.jar</exclude>
<exclude>plugins/websocket*.jar</exclude>
<exclude>plugins/tomcat-embed*.jar</exclude> <!-- added for Red5 lib substitution -->
@@ -141,6 +142,7 @@
<include>geronimo-jpa*</include>
<include>commons-fileupload*</include>
<include>commons-io*</include>
+ <include>commons-lang3*</include>
</includes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d41832b1/openmeetings-server/src/site/stylesheets/configs.xsl
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/configs.xsl b/openmeetings-server/src/site/stylesheets/configs.xsl
index fff57e3..e66fc69 100644
--- a/openmeetings-server/src/site/stylesheets/configs.xsl
+++ b/openmeetings-server/src/site/stylesheets/configs.xsl
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
<xsl:output method="xml"/>
<xsl:template match="root">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d41832b1/openmeetings-server/src/site/stylesheets/errortable.xsl
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/errortable.xsl b/openmeetings-server/src/site/stylesheets/errortable.xsl
index 4a66c8d..55d1a5b 100644
--- a/openmeetings-server/src/site/stylesheets/errortable.xsl
+++ b/openmeetings-server/src/site/stylesheets/errortable.xsl
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
<xsl:param name="languagesDir"/>
<xsl:output method="xml"/>