Author: wkeil
Date: Sun Jul 20 17:24:09 2014
New Revision: 1612123
URL: http://svn.apache.org/r1612123
Log:
DMAP-35: Refactor Simple DDR
Simplified dependencies in POM
Task-Url: https://issues.apache.org/jira/browse/DMAP-35
Added:
incubator/devicemap/trunk/devicemap/java/simpleddr/DISCLAIMER
Modified:
incubator/devicemap/trunk/devicemap/java/pom.xml
incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml
Modified: incubator/devicemap/trunk/devicemap/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/pom.xml?rev=1612123&r1=1612122&r2=1612123&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/pom.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/pom.xml Sun Jul 20 17:24:09 2014
@@ -1,68 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>14</version>
- </parent>
-
- <groupId>org.apache.devicemap</groupId>
- <artifactId>devicemap-java</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>Apache DeviceMap Java Parent</name>
- <description>Apache DeviceMap Java Parent</description>
- <url>http://incubator.apache.org/devicemap</url>
-
- <modules>
- <module>classifier</module>
- <module>simpleddr</module>
- </modules>
-
- <!-- Test settings that can be overridden from the Maven command line -->
- <properties>
- <java.version>1.6</java.version>
- <jdkVersion>${java.version}</jdkVersion>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file
to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the
specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ </parent>
+
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-java</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Apache DeviceMap Java Parent</name>
+ <description>Apache DeviceMap Java Parent</description>
+ <url>http://incubator.apache.org/devicemap</url>
+
+ <modules>
+ <module>classifier</module>
+ <module>simpleddr</module>
+ </modules>
+
+ <!-- Test settings that can be overridden from the Maven command line
-->
+ <properties>
+ <java.version>1.6</java.version>
+ <jdkVersion>${java.version}</jdkVersion>
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <!-- Set this to N to execute only N tests -->
- <devicemap.max.tests>0</devicemap.max.tests>
-
- <!-- The test data file maps User-Agent values to expected device
properties -->
-
<devicemap.test.data.file>${project.build.directory}/devicemap/test-data/dmap_20130522.txt</devicemap.test.data.file>
-
- <!-- Where to find the device data -->
-
<devicemap.device.data.folder>${project.build.directory}/devicemap/devicedata</devicemap.device.data.folder>
- </properties>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemapjava</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/devicemap/trunk/java</url>
- </scm>
-
+
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <!-- Set this to N to execute only N tests -->
+ <devicemap.max.tests>0</devicemap.max.tests>
+
+ <!-- The test data file maps User-Agent values to expected
device properties -->
+
<devicemap.test.data.file>${project.build.directory}/devicemap/test-data/dmap_20130522.txt</devicemap.test.data.file>
+
+ <!-- Where to find the device data -->
+
<devicemap.device.data.folder>${project.build.directory}/devicemap/devicedata</devicemap.device.data.folder>
+ </properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/devicemap/trunk/devicemap/java</developerConnection>
+
<url>http://svn.apache.org/viewvc/incubator/devicemap/trunk/java</url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-data</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-test-data</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
Added: incubator/devicemap/trunk/devicemap/java/simpleddr/DISCLAIMER
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/DISCLAIMER?rev=1612123&view=auto
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/DISCLAIMER (added)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/DISCLAIMER Sun Jul 20
17:24:09 2014
@@ -0,0 +1,7 @@
+Apache DeviceMap is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by Apache. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is
+not necessarily a reflection of the completeness or stability of the code,
+it does indicate that the project has yet to be fully endorsed by the ASF.
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml?rev=1612123&r1=1612122&r2=1612123&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml Sun Jul 20
17:24:09 2014
@@ -17,7 +17,7 @@
<artifactId>devicemap-java</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
+ <description>Apache DeviceMap Simple DDR Java module</description>
<artifactId>devicemap-simpleddr</artifactId>
<packaging>jar</packaging>
<name>Apache DeviceMap Simple DDR</name>
@@ -25,7 +25,7 @@
<url>http://incubator.apache.org/devicemap</url>
<prerequisites>
- <maven>3.0.3</maven>
+ <maven>3.0.4</maven>
</prerequisites>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/devicemap/trunk/java/simpleddr</connection>
@@ -105,23 +105,19 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
</dependency>
<!-- dependency>
<groupId>org.w3c</groupId>
@@ -136,19 +132,16 @@
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-data</artifactId>
- <version>1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-test-data</artifactId>
- <version>1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -187,5 +180,4 @@
</build>
</profile>
</profiles>
- <description>Apache DeviceMap Simple DDR Java module</description>
</project>
