svn commit: r1622381 - in /incubator/devicemap/trunk/devicemap/java: pom.xml simpleddr/pom.xml simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java

[wkeil]

Author: wkeil
Date: Thu Sep  4 00:09:15 2014
New Revision: 1622381

URL: http://svn.apache.org/r1622381
Log:
DMAP-46: Pixel density or screen dimensions 
Updated dependencies to data
Task-Url: https://issues.apache.org/jira/browse/DMAP-46

Modified:
    incubator/devicemap/trunk/devicemap/java/pom.xml
    incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml
    
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java

Modified: incubator/devicemap/trunk/devicemap/java/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/pom.xml?rev=1622381&r1=1622380&r2=1622381&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/pom.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/pom.xml Thu Sep  4 00:09:15 2014
@@ -29,7 +29,7 @@ under the License.
        <groupId>org.apache.devicemap</groupId>
        <artifactId>devicemap-java</artifactId>
        <packaging>pom</packaging>
-       <version>1.0.1-SNAPSHOT</version>
+       <version>1.0.1</version>
        <name>Apache DeviceMap Java Parent</name>
        <description>Apache DeviceMap Java Parent</description>
        <url>http://incubator.apache.org/devicemap</url>
@@ -45,8 +45,8 @@ under the License.
                <jdkVersion>${java.version}</jdkVersion>
                
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
                
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
-               <devicemap.data.version>1.0.1-SNAPSHOT</devicemap.data.version>
-               <devicemap.testdata.version>1.0.0</devicemap.testdata.version>
+               <devicemap.data.version>1.0.1</devicemap.data.version>
+               
<devicemap.testdata.version>1.0.1-SNAPSHOT</devicemap.testdata.version>
                
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -71,7 +71,7 @@ under the License.
                        <dependency>
                                <groupId>org.apache.commons</groupId>
                                <artifactId>commons-jexl</artifactId>
-                               <version>2.1</version>
+                               <version>2.1.1</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>

Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml?rev=1622381&r1=1622380&r2=1622381&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml Thu Sep  4 
00:09:15 2014
@@ -17,7 +17,7 @@
                <artifactId>devicemap-java</artifactId>
                <version>1.0.1-SNAPSHOT</version>
        </parent>
-       <version>1.0.0</version>
+       <version>1.0.0-RC3</version>
        <description>Apache DeviceMap Simple DDR Java module</description>
        <artifactId>devicemap-simpleddr</artifactId>
        <packaging>jar</packaging>
@@ -135,6 +135,12 @@
                        <groupId>commons-lang</groupId>
                        <artifactId>commons-lang</artifactId>
                </dependency>
+
+               <dependency>
+                       <groupId>commons-logging</groupId>
+                       <artifactId>commons-logging</artifactId>
+                       <version>1.1.1</version>
+               </dependency>
                <dependency>
                        <groupId>org.apache.devicemap</groupId>
                        <artifactId>devicemap-data</artifactId>

Modified: 
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java
URL: 
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java?rev=1622381&r1=1622380&r2=1622381&view=diff
==============================================================================
--- 
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java
 (original)
+++ 
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java
 Thu Sep  4 00:09:15 2014
@@ -18,6 +18,10 @@
  */
 package org.apache.devicemap.simpleddr;
 
+import org.apache.commons.jexl2.Expression;
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
 import org.apache.devicemap.simpleddr.model.ODDRPropertyValue;
 
 import java.io.File;
@@ -37,10 +41,6 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.commons.jexl2.Expression;
-import org.apache.commons.jexl2.JexlContext;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.MapContext;
 import org.apache.devicemap.simpleddr.builder.Builder;
 import org.apache.devicemap.simpleddr.builder.browser.DefaultBrowserBuilder;
 import org.apache.devicemap.simpleddr.builder.device.DeviceBuilder;