devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1742811 - in /devicemap/trunk/examples/1.0/java: pom.xml servlet/pom.xml spring/pom.xml
Date Sun, 08 May 2016 13:10:14 GMT
Author: wkeil
Date: Sun May  8 13:10:14 2016
New Revision: 1742811

URL: http://svn.apache.org/viewvc?rev=1742811&view=rev
Log:
DMAP-191: DMAP-Spring on VM broken 

Task-Url: https://issues.apache.org/jira/browse/DMAP-191

Added:
    devicemap/trunk/examples/1.0/java/pom.xml
Modified:
    devicemap/trunk/examples/1.0/java/servlet/pom.xml
    devicemap/trunk/examples/1.0/java/spring/pom.xml

Added: devicemap/trunk/examples/1.0/java/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/1.0/java/pom.xml?rev=1742811&view=auto
==============================================================================
--- devicemap/trunk/examples/1.0/java/pom.xml (added)
+++ devicemap/trunk/examples/1.0/java/pom.xml Sun May  8 13:10:14 2016
@@ -0,0 +1,77 @@
+<?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>16</version>
+		<relativePath />
+	</parent>
+
+	<groupId>org.apache.devicemap.examples</groupId>
+	<artifactId>dmap-java-examples</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>Apache DeviceMap Examples for Java</name>
+	<description>Apache DeviceMap Java Examples</description>
+	<url>http://devicemap.apache.org/</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/devicemap/trunk/examples/1.0/java</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/devicemap/trunk/examples/1.0/java</developerConnection>
+		<url>http://svn.apache.org/viewvc/devicemap/trunk/examples/1.0/java</url>
+	</scm>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.devicemap</groupId>
+				<artifactId>devicemap-client</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.devicemap</groupId>
+				<artifactId>devicemap-data</artifactId>
+				<version>1.0.2</version>
+			</dependency>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.17</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+				<version>2.5</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet.jsp</groupId>
+				<artifactId>jsp-api</artifactId>
+				<version>2.1</version>
+				<scope>provided</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>servlet</module>
+		<module>spring</module>
+	</modules>
+</project>

Modified: devicemap/trunk/examples/1.0/java/servlet/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/1.0/java/servlet/pom.xml?rev=1742811&r1=1742810&r2=1742811&view=diff
==============================================================================
--- devicemap/trunk/examples/1.0/java/servlet/pom.xml (original)
+++ devicemap/trunk/examples/1.0/java/servlet/pom.xml Sun May  8 13:10:14 2016
@@ -21,10 +21,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.apache.devicemap.examples</groupId>
     <artifactId>dmap-servlet</artifactId>
     <packaging>war</packaging>
-    <version>1.0.0-SNAPSHOT</version>
     <name>DeviceMap Servlet Example</name>
     <description>Apache DeviceMap Servlet Example</description>
 
@@ -39,18 +37,15 @@
         <dependency>
             <groupId>org.apache.devicemap</groupId>
             <artifactId>devicemap-client</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -80,7 +75,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -90,4 +84,9 @@
         </plugins>
     </build>
 
+    <parent>
+    	<groupId>org.apache.devicemap.examples</groupId>
+    	<artifactId>dmap-java-examples</artifactId>
+    	<version>1.0.0-SNAPSHOT</version>
+    </parent>
 </project>

Modified: devicemap/trunk/examples/1.0/java/spring/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/1.0/java/spring/pom.xml?rev=1742811&r1=1742810&r2=1742811&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message