Author: solomax
Date: Tue May 12 16:09:04 2015
New Revision: 1678992
URL: http://svn.apache.org/r1678992
Log:
[OPENMEETINGS-980] fluido-skin, commons-cli, directory.api and cxf versions are
updated
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/trunk/singlewebapp/pom.xml
openmeetings/trunk/singlewebapp/src/site/site.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1678992&r1=1678991&r2=1678992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Tue May 12
16:09:04 2015
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>1.0.0-M29</version>
+ <version>1.0.0-M30</version>
</dependency>
</dependencies>
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1678992&r1=1678991&r2=1678992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Tue May 12
16:09:04 2015
@@ -30,7 +30,7 @@
<name>Openmeetings Install</name>
<description>TODO</description>
<properties>
- <commons-cli.version>1.2</commons-cli.version>
+ <commons-cli.version>1.3</commons-cli.version>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1678992&r1=1678991&r2=1678992&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
Tue May 12 16:09:04 2015
@@ -21,7 +21,6 @@ package org.apache.openmeetings.cli;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
@@ -42,7 +41,10 @@ public class OmHelpFormatter extends Hel
private List<OmOption> getReqOptions(Options opts) {
//suppose we have only 1 group (for now)
OptionGroup g =
((List<OptionGroup>)opts.getRequiredOptions()).get(0);
- List<OmOption> result = new ArrayList<OmOption>(g.getOptions());
+ List<OmOption> result = new ArrayList<OmOption>();
+ for (Option o : g.getOptions()) {
+ result.add((OmOption)o);
+ }
Collections.sort(result, new Comparator<OmOption>() {
public int compare(OmOption o1, OmOption o2) {
return o1.getOrder() - o2.getOrder();
@@ -51,7 +53,6 @@ public class OmHelpFormatter extends Hel
return result;
}
- @SuppressWarnings("unchecked")
private LinkedHashMap<String, List<OmOption>> getOptions(Options opts,
int leftPad) {
final String longOptSeparator = " ";
final String lpad = createPadding(leftPad);
@@ -62,7 +63,8 @@ public class OmHelpFormatter extends Hel
for (OmOption o : reqOptions) {
map.put(o.getOpt(), new ArrayList<OmOption>());
}
- for (OmOption o : (Collection<OmOption>)opts.getOptions()) {
+ for (Option _o : opts.getOptions()) {
+ OmOption o = (OmOption)_o;
//TODO need better check (required option should go
first and should not be duplicated
boolean skipOption = map.containsKey(o.getOpt());
boolean mainOption = skipOption || o.getGroup() == null;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1678992&r1=1678991&r2=1678992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue May 12 16:09:04 2015
@@ -49,7 +49,7 @@
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>1.0.6</ical4j.version>
- <cxf.version>3.0.1</cxf.version>
+ <cxf.version>3.1.0</cxf.version>
<selenium.version>2.42.2</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.3.5</jettison.version>
Modified: openmeetings/trunk/singlewebapp/src/site/site.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/site.xml?rev=1678992&r1=1678991&r2=1678992&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/site.xml (original)
+++ openmeetings/trunk/singlewebapp/src/site/site.xml Tue May 12 16:09:04 2015
@@ -25,7 +25,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</skin>
<version position="none"/>
