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/10/08 14:27:36 UTC
openmeetings git commit: [OPENMEETINGS-980] maven-war-plugin version
updated, cliparts are fixed
Repository: openmeetings
Updated Branches:
refs/heads/master b0c04fb4b -> 6311a6978
[OPENMEETINGS-980] maven-war-plugin version updated, cliparts are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6311a697
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6311a697
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6311a697
Branch: refs/heads/master
Commit: 6311a6978586bb7197902333a8af15bcf4d0e2b3
Parents: b0c04fb
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Oct 8 21:27:22 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Oct 8 21:27:22 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 3 +--
pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6311a697/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index d1f87dd..cd4ab95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -74,7 +74,6 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
@@ -154,7 +153,7 @@ public class WbPanel extends AbstractWbPanel {
protected void populateItem(ListItem<String> item) {
String cls = String.format("clipart-%s", item.getIndex());
item.add(append("class", cls), append("data-mode", cls)
- , AttributeModifier.replace("data-image", item.getModelObject()));
+ , append("data-image", item.getModelObject()).setSeparator(""));
}
}, fileName);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6311a697/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d72595..eff3267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
<maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
- <maven-war-plugin.version>3.0.0</maven-war-plugin.version> <!-- 3.1.0 is broken https://issues.apache.org/jira/browse/MWAR-407 -->
+ <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
<!-- dependency versions -->
<junit.version>4.12</junit.version>
<wicket.version>8.0.0-SNAPSHOT</wicket.version>