Author: wkeil
Date: Wed Jan 7 22:49:43 2015
New Revision: 1650188
URL: http://svn.apache.org/r1650188
Log:
Made W3C lib available in shared folder to all downstream projects
Added:
devicemap/trunk/devicemap/java/lib/
- copied from r1649916, devicemap/trunk/devicemap/java/simpleddr/lib/
Removed:
devicemap/trunk/devicemap/java/simpleddr/lib/
Modified:
devicemap/trunk/devicemap/java/classifier_w3c_simple/pom.xml
devicemap/trunk/devicemap/java/simpleddr/pom.xml
Modified: devicemap/trunk/devicemap/java/classifier_w3c_simple/pom.xml
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier_w3c_simple/pom.xml?rev=1650188&r1=1650187&r2=1650188&view=diff
==============================================================================
--- devicemap/trunk/devicemap/java/classifier_w3c_simple/pom.xml (original)
+++ devicemap/trunk/devicemap/java/classifier_w3c_simple/pom.xml Wed Jan 7
22:49:43 2015
@@ -1,92 +1,99 @@
<?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.
--->
+<!-- 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>
+ 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</groupId>
- <artifactId>devicemap-client-w3c-simple</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>Apache DeviceMap Java W3C Simple API</name>
- <description>Apache DeviceMap Java W3C Simple API</description>
-
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.devicemap</groupId>
- <artifactId>devicemap-client</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- <!-- WARNING, this jar is unpublished and unlicensed -->
- <dependency>
- <groupId>org.w3c.ddr</groupId>
- <artifactId>simple</artifactId>
- <version>20081205</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.devicemap</groupId>
- <artifactId>devicemap-data</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <debug>true</debug>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>16</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-client-w3c-simple</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Apache DeviceMap Java W3C Simple API</name>
+ <description>Apache DeviceMap Java W3C Simple API</description>
+
+
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-client</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+
+ <!-- WARNING, this jar is unpublished and unlicensed
<dependency> <groupId>org.w3c.ddr</groupId>
+ <artifactId>simple</artifactId>
<version>20081205</version> </dependency> -->
+
+ <dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-data</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>com.googlecode.addjars-maven-plugin</groupId>
+ <artifactId>addjars-maven-plugin</artifactId>
+ <version>1.0.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>add-jars</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${basedir}/../lib</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: devicemap/trunk/devicemap/java/simpleddr/pom.xml
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/simpleddr/pom.xml?rev=1650188&r1=1650187&r2=1650188&view=diff
==============================================================================
--- devicemap/trunk/devicemap/java/simpleddr/pom.xml (original)
+++ devicemap/trunk/devicemap/java/simpleddr/pom.xml Wed Jan 7 22:49:43 2015
@@ -17,7 +17,7 @@
<artifactId>devicemap-java</artifactId>
<version>1.2.0</version>
</parent>
- <description>Apache DeviceMap Simple DDR Java module.
+ <description>Apache DeviceMap Simple DDR Java implementation.
Open Source Reference Implementation of W3C DDR Standard</description>
<artifactId>devicemap-simpleddr</artifactId>
<packaging>jar</packaging>
@@ -31,7 +31,7 @@ Open Source Reference Implementation of
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/devicemap/trunk/java/simpleddr</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/devicemap/trunk/devicemap/java/simpleddr</developerConnection>
-
<url>http://svn.apache.org/viewvc/devicemap/trunk/openddr/java</url>
+
<url>http://svn.apache.org/viewvc/devicemap/trunk/java/simpleddr</url>
</scm>
<build>
@@ -55,7 +55,7 @@ Open Source Reference Implementation of
<configuration>
<resources>
<resource>
-
<directory>${basedir}/lib</directory>
+
<directory>${basedir}/../lib</directory>
</resource>
</resources>
</configuration>
