Revision: 5265
http://sourceforge.net/p/jump-pilot/code/5265
Author: edso
Date: 2016-12-17 14:47:12 +0000 (Sat, 17 Dec 2016)
Log Message:
-----------
upgrade apache commons-lang to latest version 3
previously commons-lang2 was introduced 2013 when adding imageio-ext . a quick
source check shows that only imageio-ext nitf actually uses it, move
commons-lang2 jar into lib/plus/imageio-ext/ therefore.
we might have to move it back to lib/ in case some other extension started
using it to inbetween. should update to latest stable 2.6 then as well.
Modified Paths:
--------------
core/trunk/pom.xml
core/trunk/src/com/vividsolutions/jump/util/commandline/OptionSpec.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPlugIn.java
core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CalcVarianceAndMeanPerClassPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
core/trunk/src/org/saig/jump/widgets/config/HTTPProxySettings.java
Added Paths:
-----------
core/trunk/lib/commons-lang3-3.5.jar
core/trunk/lib/plus/imageio-ext/commons-lang-2.4.jar
Removed Paths:
-------------
core/trunk/lib/commons-lang-2.4.jar
Deleted: core/trunk/lib/commons-lang-2.4.jar
===================================================================
(Binary files differ)
Added: core/trunk/lib/commons-lang3-3.5.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/commons-lang3-3.5.jar
===================================================================
--- core/trunk/lib/commons-lang3-3.5.jar 2016-12-16 12:19:39 UTC (rev
5264)
+++ core/trunk/lib/commons-lang3-3.5.jar 2016-12-17 14:47:12 UTC (rev
5265)
Property changes on: core/trunk/lib/commons-lang3-3.5.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied: core/trunk/lib/plus/imageio-ext/commons-lang-2.4.jar (from rev 5264,
core/trunk/lib/commons-lang-2.4.jar)
===================================================================
(Binary files differ)
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2016-12-16 12:19:39 UTC (rev 5264)
+++ core/trunk/pom.xml 2016-12-17 14:47:12 UTC (rev 5265)
@@ -915,7 +915,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>javax.media</groupId>
Modified:
core/trunk/src/com/vividsolutions/jump/util/commandline/OptionSpec.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/commandline/OptionSpec.java
2016-12-16 12:19:39 UTC (rev 5264)
+++ core/trunk/src/com/vividsolutions/jump/util/commandline/OptionSpec.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -36,7 +36,7 @@
import java.util.Iterator;
import java.util.Vector;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
2016-12-16 12:19:39 UTC (rev 5264)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -76,7 +76,7 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.saig.core.gui.swing.sldeditor.util.FormUtils;
import org.saig.jump.widgets.config.HTTPProxySettings;
import org.saig.jump.widgets.config.ProxyAuth;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPanel.java
2016-12-16 12:19:39 UTC (rev 5264)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPanel.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -58,7 +58,7 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.openjump.core.ui.plugin.wms.AddWmsLayerWizard;
import org.openjump.util.UriUtil;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPlugIn.java
2016-12-16 12:19:39 UTC (rev 5264)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/wms/EditWMSQueryPlugIn.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -41,7 +41,7 @@
import javax.swing.Icon;
import javax.swing.JLabel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.openjump.core.ui.plugin.wms.AddWmsLayerWizard;
import com.vividsolutions.jump.I18N;
Modified: core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
===================================================================
--- core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
2016-12-16 12:19:39 UTC (rev 5264)
+++ core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -55,8 +55,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
-import org.deegree.framework.log.ILogger;
+import org.apache.commons.lang3.StringUtils;
import org.deegree.framework.util.StringTools;
import org.deegree.framework.xml.ElementList;
import org.deegree.framework.xml.NamespaceContext;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CalcVarianceAndMeanPerClassPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CalcVarianceAndMeanPerClassPlugIn.java
2016-12-16 12:19:39 UTC (rev 5264)
+++
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CalcVarianceAndMeanPerClassPlugIn.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -46,7 +46,7 @@
import com.vividsolutions.jump.feature.*;
import com.vividsolutions.jump.workbench.ui.*;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.math.array.StatisticSample;
import org.openjump.core.apitools.FeatureSchemaTools;
Modified: core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
2016-12-16 12:19:39 UTC (rev 5264)
+++ core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -18,7 +18,7 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.openjump.core.apitools.LayerTools;
import org.openjump.core.ui.swing.DetachableInternalFrame;
Modified: core/trunk/src/org/saig/jump/widgets/config/HTTPProxySettings.java
===================================================================
--- core/trunk/src/org/saig/jump/widgets/config/HTTPProxySettings.java
2016-12-16 12:19:39 UTC (rev 5264)
+++ core/trunk/src/org/saig/jump/widgets/config/HTTPProxySettings.java
2016-12-17 14:47:12 UTC (rev 5265)
@@ -36,7 +36,7 @@
*/
package org.saig.jump.widgets.config;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.saig.core.crypt.CryptManager;
import org.saig.core.crypt.CryptManagerException;
import org.saig.core.crypt.CryptManagerFactory;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel