Skip to content

Commit

Permalink
Feature/new 52n parent (#71)
Browse files Browse the repository at this point in the history 
* Update to latest 52N maven parent

- dependency managements updated:
  - remove outdated
  - add used and undeclared
  - add runtime scope if required
- fix javadoc
  - become compliant with HTML 4.0
  - add missing information

* Document version requirements for developers
* Minor updates
* Switch to Java 8
* Remove duplicate line from .travis.yml
* Minor layout change: \t -> '    '
* Checkstyle #1
* Checkstyle #2
* Checkstyle #3
* Checkstyle #4
* Checkstyle #4
* Checkstyle #5
* Checkstyle #6
* Checkstyle #7
* Checkstyle #8
* Checkstyle #9
* Checkstyle #10
* Checkstyle #11
* Checkstyle #12
* Checkstyle #13
* Checkstyle #14
* Checkstyle #15
* Checkstyle #16
* Checkstyle #17
* Checkstyle #18
* Checkstyle #19
* Checkstyle #20
* Checkstyle #21
* Checkstyle #22
* Checkstyle #23
* Checkstyle #24
* Checkstyle #25
* Checkstyle #26
* Checkstyle #27
* Checkstyle #28
* Checkstyle #29
* Remove not available jdk "openjdk8"
* Checkstyle #30
* Checkstyle #31
* Checkstyle #32
* Fix findbugs issues
* Fix findbugs issues #2
* Disable checkstyle for codeless module
* Add repos again and allow them
* Add 52n repositories
* Fix findbugs issues #3
* Findbugs #4
* Findbugs #5
* Findbugs #6
* Findbugs #7
* Findbugs #8
* Add missing dependencies
* Findbugs #9 && Checkstyle #33
* Findbugs #10
* Checkstyle #34
  • Loading branch information
@EHJ-52n
EHJ-52n committed Jan 29, 2017
1 parent 2ce74bf commit 53aaa41
Show file tree
Hide file tree
Showing 218 changed files with 35,854 additions and 26,458 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ language: java
#notifications:
# email: false
jdk:
- openjdk7
- oraclejdk7
# - oraclejdk8
- oraclejdk8
install: true
script: mvn clean install
notifications:
Expand Down
6 changes: 4 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# 52°North SOS Importer
[:arrow_forward: How to Run](#how-to-run)&nbsp;&nbsp;&nbsp;[:nut_and_bolt: How to Build](#how-to-build)&nbsp;&nbsp;&nbsp;[:pencil: How to Develop](#developers)&nbsp;&nbsp;&nbsp;**Master**: <a href='https://build.dev.52north.org/jenkins/view/Sensor%20Web/job/sos-importer/'><img src='https://build.dev.52north.org/jenkins/buildStatus/icon?job=sos-importer' /></a>&nbsp;<a href="https://travis-ci.org/52North/sos-importer"><img src="https://travis-ci.org/52North/sos-importer.svg?branch=master" /></a>&nbsp;&nbsp;&nbsp;**Develop**: <a href='https://build.dev.52north.org/jenkins/view/Sensor%20Web/job/sos-importer_develop/'><img src='https://build.dev.52north.org/jenkins/buildStatus/icon?job=sos-importer_develop' /></a>&nbsp;<a href="https://travis-ci.org/52North/sos-importer"><img src="https://travis-ci.org/52North/sos-importer.svg?branch=develop" /></a>&nbsp;&nbsp;<sup><a href="#branches"><b>*</b></a></sup>
[:arrow_forward: How to Run](#how-to-run)&nbsp;&nbsp;&nbsp;[:nut_and_bolt: How to Build](#how-to-build)&nbsp;&nbsp;&nbsp;[:pencil: How to Develop](#developers)

**Master**: <a href='https://build.dev.52north.org/jenkins/view/Sensor%20Web/job/sos-importer/'><img src='https://build.dev.52north.org/jenkins/buildStatus/icon?job=sos-importer' /></a>&nbsp;<a href="https://travis-ci.org/52North/sos-importer"><img src="https://travis-ci.org/52North/sos-importer.svg?branch=master" /></a>&nbsp;&nbsp;&nbsp;**Develop**: <a href='https://build.dev.52north.org/jenkins/view/Sensor%20Web/job/sos-importer_develop/'><img src='https://build.dev.52north.org/jenkins/buildStatus/icon?job=sos-importer_develop' /></a>&nbsp;<a href="https://travis-ci.org/52North/sos-importer"><img src="https://travis-ci.org/52North/sos-importer.svg?branch=develop" /></a>&nbsp;&nbsp;<sup><a href="#branches"><b>*</b></a></sup>

## Description

Expand Down Expand Up @@ -421,7 +423,7 @@ You can just download example files to see how the application works:

## How to Build

1. Have jdk, maven, and git installed already.
1. Have jdk (>=1.7), maven (>=3.1.1), and git installed already.
1. Due to some updates to the OX-Framework done during the SOS-Importer development, you might need to build the OX-F from the branch *develop*. Please check in the `pom.xml` the value of `<oxf.version>`. If it ends with `-SNAPSHOT`, continue here, else continue with step #3:

```
Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ For a complete Release Notes overview visit

## Changes:
* Moved documentation to github, hence content of README.md and https://wiki.52north.org/bin/view/SensorWeb/SosImporter merged
* Updated to latest 52N parent &rarr; javadoc and dependency plugin cause a lot of minor adjustments

## Bugfixes:
* #35: Could not parse ISO8601 timestamps with timezone "Z"
Expand Down
109 changes: 63 additions & 46 deletions bindings/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?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">
<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.n52.sensorweb</groupId>
Expand All @@ -10,11 +11,14 @@
<name>XMLbeans Module</name>
<description>52North SOS Importer XML Bindings Module</description>
<licenses>
<license>
<name>GNU General Public License v2.0 only</name>
<url>http://www.spdx.org/licenses/GPL-2.0</url>
</license>
<license>
<name>GNU General Public License v2.0 only</name>
<url>http://www.spdx.org/licenses/GPL-2.0</url>
</license>
</licenses>
<properties>
<checkstyle.skip>true</checkstyle.skip>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -41,57 +45,70 @@
</configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<header>src/main/resources/52n_license_header.txt</header>
<aggregate>true</aggregate>
<properties>
<inceptionYear>${project.inceptionYear}</inceptionYear>
<latestYearOfContribution>${currentYear}</latestYearOfContribution>
<!-- <latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution> -->
</properties>
<includes>
<include>src/**/*.java</include>
<include>src/**/*.xml</include>
<include>src/**/*.xsd</include>
<include>src/**/*.properties</include>
</includes>
<excludes>
<exclude>**/logback.xml</exclude>
<exclude>**/logback-test.xml</exclude>
<exclude>**/src/test/resources/**</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.odt</exclude>
<exclude>**/THIRD-PARTY.properties</exclude>
<exclude>**/NOTICE.template</exclude>
<exclude>**/*.md</exclude>
<exclude>**/RELEASE_NOTES</exclude>
<exclude>**/LICENSE.gpl-2.0</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>check-license</id>
<phase>initialize</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<header>src/main/resources/52n_license_header.txt</header>
<aggregate>true</aggregate>
<properties>
<inceptionYear>${project.inceptionYear}</inceptionYear>
<latestYearOfContribution>${currentYear}</latestYearOfContribution>
<!-- <latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution> -->
</properties>
<includes>
<include>src/**/*.java</include>
<include>src/**/*.xml</include>
<include>src/**/*.xsd</include>
<include>src/**/*.properties</include>
</includes>
<excludes>
<exclude>**/logback.xml</exclude>
<exclude>**/logback-test.xml</exclude>
<exclude>**/src/test/resources/**</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.odt</exclude>
<exclude>**/THIRD-PARTY.properties</exclude>
<exclude>**/NOTICE.template</exclude>
<exclude>**/*.md</exclude>
<exclude>**/RELEASE_NOTES</exclude>
<exclude>**/LICENSE.gpl-2.0</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>check-license</id>
<phase>initialize</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
103 changes: 83 additions & 20 deletions feeder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,23 @@
<groupId>${project.groupId}</groupId>
<artifactId>52n-oxf-xmlbeans</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -85,16 +75,90 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-swes-v20</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-sweCommon-v20</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-sos-v20</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-sos-v100</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>oxf-adapter-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>oxf-common</artifactId>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-sweCommon-v101</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-gml-v311</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>52n-xml-sensorML-v101</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<compilerArgument>-Xlint:all</compilerArgument>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
Expand Down Expand Up @@ -153,7 +217,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<configuration>
<!-- <descriptorRefs>-->
<!-- <descriptorRef>jar-with-dependencies</descriptorRef>-->
Expand Down
Loading

0 comments on commit 53aaa41

Please sign in to comment.