Author: wkeil
Date: Mon Mar 24 01:31:14 2014
New Revision: 1580685
URL: http://svn.apache.org/r1580685
Log:
OPEN - issue DMAP-23: Java: tests
https://issues.apache.org/jira/browse/DMAP-23
Modified:
incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml
incubator/devicemap/trunk/contrib/web/pom.xml
incubator/devicemap/trunk/contrib/web/webfilter/pom.xml
incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml
Modified: incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml?rev=1580685&r1=1580684&r2=1580685&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/devicemapweb/pom.xml Mon Mar 24
01:31:14 2014
@@ -5,9 +5,14 @@
<artifactId>devicemapweb</artifactId>
<name>Apache DeviceMap Web Site</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<packaging>war</packaging>
-
+ <parent>
+ <groupId>org.apache.devicemap.web</groupId>
+ <artifactId>web-parent</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
<dependencies>
<dependency>
<groupId>c3p0</groupId>
@@ -110,9 +115,4 @@
</properties>
</profile>
</profiles>
- <parent>
- <groupId>org.apache.devicemap.web</groupId>
- <artifactId>web-parent</artifactId>
- <version>0.1</version>
- </parent>
</project>
Modified: incubator/devicemap/trunk/contrib/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/pom.xml?rev=1580685&r1=1580684&r2=1580685&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/pom.xml Mon Mar 24 01:31:14 2014
@@ -11,11 +11,12 @@
<version>9</version>
</parent>
<url>http://incubator.apache.org/devicemap</url>
- <version>0.1</version>
+ <version>0.2-SNAPSHOT</version>
<properties>
<java.version>1.6</java.version>
<devicemap.version>0.9.9-SNAPSHOT</devicemap.version>
+ <w3cddr.version>2008-04-04</w3cddr.version>
<build.date>${maven.build.timestamp}</build.date>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMdd_HHmm</maven.build.timestamp.format>
Modified: incubator/devicemap/trunk/contrib/web/webfilter/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/pom.xml?rev=1580685&r1=1580684&r2=1580685&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webfilter/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/webfilter/pom.xml Mon Mar 24 01:31:14
2014
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.devicemap.web</groupId>
<artifactId>web-parent</artifactId>
- <version>0.1</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>devicemapfilter</artifactId>
<packaging>war</packaging>
Modified: incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml?rev=1580685&r1=1580684&r2=1580685&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml (original)
+++ incubator/devicemap/trunk/contrib/web/webservice-java/pom.xml Mon Mar 24
01:31:14 2014
@@ -5,16 +5,15 @@
<artifactId>devicemapjavaservice</artifactId>
<name>Apache DeviceMap Java Web Service</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<packaging>war</packaging>
-
- <properties>
- <java.version>1.6</java.version>
- <build.date>${maven.build.timestamp}</build.date>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<maven.build.timestamp.format>yyyyMMdd_HHmm</maven.build.timestamp.format>
- </properties>
-
+
+ <parent>
+ <groupId>org.apache.devicemap.web</groupId>
+ <artifactId>web-parent</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -45,17 +44,17 @@
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-openddr-java</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>${devicemap.version}</version>
</dependency>
<dependency>
<groupId>org.apache.devicemap</groupId>
<artifactId>devicemap-device-data</artifactId>
- <version>0.9.9-SNAPSHOT</version>
+ <version>${devicemap.version}</version>
</dependency>
<dependency>
<groupId>org.w3c.ddr.simple</groupId>
<artifactId>DDR-Simple-API</artifactId>
- <version>2008-04-04</version>
+ <version>${w3cddr.version}</version>
</dependency>
<!--
<dependency>
@@ -124,9 +123,4 @@
</properties>
</profile>
</profiles>
- <parent>
- <groupId>org.apache.devicemap.web</groupId>
- <artifactId>web-parent</artifactId>
- <version>0.1</version>
- </parent>
</project>
