Skip to content

Commit

Permalink
Merge pull request #19 from 52North/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
CarstenHollmann committed Mar 21, 2014
2 parents 3ce3b11 + 8ae4cd5 commit 4660de5
Show file tree
Hide file tree
Showing 99 changed files with 3,204 additions and 3,121 deletions.
9 changes: 9 additions & 0 deletions RELEASE-NOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ RELEASE NOTES
SensorML instance document), and information about the sensor mounting platform
(SensorML as well).

Changes since last release
==================================

--- New features ---

--- Changes ---

--- Fixed bugs ---

Release 52n-sos-4.0.0
==================================

Expand Down
2 changes: 1 addition & 1 deletion bindings/json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.0.0</version>
<version>4.0.1</version>
</parent>
<artifactId>binding-json</artifactId>
<name>52°North SOS - JSON Binding</name>
Expand Down
60 changes: 30 additions & 30 deletions bindings/kvp/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-kvp</artifactId>
<packaging>jar</packaging>
<name>52°North SOS - KVP Binding</name>
<description>52°North Sensor Observation Service KVP binding</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-kvp</artifactId>
<packaging>jar</packaging>
<name>52°North SOS - KVP Binding</name>
<description>52°North Sensor Observation Service KVP binding</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion bindings/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>52n-sos</artifactId>
<version>4.0.0</version>
<version>4.0.1</version>
</parent>
<artifactId>bindings</artifactId>
<packaging>pom</packaging>
Expand Down
48 changes: 24 additions & 24 deletions bindings/pox/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-pox</artifactId>
<packaging>jar</packaging>
<name>52°North SOS - POX Binding</name>
<description>52°North Sensor Observation Service Plain Old XML binding</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-pox</artifactId>
<packaging>jar</packaging>
<name>52°North SOS - POX Binding</name>
<description>52°North Sensor Observation Service Plain Old XML binding</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion bindings/rest/code/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>rest</artifactId>
<version>0.1.1</version>
<version>0.1.2</version>
</parent>
<artifactId>rest-code</artifactId>
<name>52°North SOS - Extension REST Binding - Core</name>
Expand Down
Loading

0 comments on commit 4660de5

Please sign in to comment.