Skip to content

Commit 8a13596

Browse files
azahnenazahnen
authored
Merge pull request #5 from interactive-instruments/sdotw
sdotw
2 parents 224d184 + 57adf89 commit 8a13596

File tree

27 files changed

+602
-67
lines changed

27 files changed

+602
-67
lines changed

‎.travis.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
language:
2+
- java
3+
before_cache:
4+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
5+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
6+
cache:
7+
directories:
8+
- "$HOME/.gradle/caches/"
9+
- "$HOME/.gradle/wrapper/"
10+
install:
11+
- "./gradlew assemble -PbintrayUser=$BINTRAY_USER -PbintrayApiKey=$BINTRAY_PASS"
12+
script:
13+
- "./gradlew check -PbintrayUser=$BINTRAY_USER -PbintrayApiKey=$BINTRAY_PASS"
14+
after_success:
15+
- if [[ -n "$TRAVIS_TAG" ]]; then ./gradlew bintrayUpload -PbintrayUser=$BINTRAY_USER
16+
-PbintrayApiKey=$BINTRAY_PASS; fi
17+
env:
18+
global:
19+
- secure: BazmN4DpQNBqMCPKxC1QgFwFYJc41WwD3TG5mLT3Rg6AJlFO3McsjiDnc8/PJIACqaOtEPfcclvvUmQuTRVguZ5pnQWrQvKlxxcslmWB+QIYP9BD2KRoGgPob0Y/V8RCveWd4HzptDP6wqnIBEHphj/yGfAO6RJpw8PLId+4Dt4hRv2NRE4b21MKueKJj/+8Kg7SocNDSwLVLqExa4vZNSLwFod3ws2Q10iXmDVw3FvH1qV1p0SwKq+34cKTt3SXccD/oy6EIKSEo9dsZqpKXw8miGRfZiiwYG1I72nbYmFDxqRGj0SfzjzFmNsRs4NoKgqyBSQ28Qca6a1ceNmqtVOn1AA09HiUKTmzg/WZrKxWXVjDOd8S4BUVmRcq2ONkkiBw7GT2Hv80X8uyoBtH4MNsLr0c2j4Kd+lA7nABdXLrwqL6KN2zeAhyXWmQ+xQuvXQV7tweBusuKh5ATqut5+iro24aUmPicfmOEz9N4itatYXV9U9r165QPhR4kDufP4zMlcfx5iztneNIXvQb1WsqEXCX2onVkjLqpVF1nXBTQttyQnzOssx/ACW3VJrMK7uuOWMHp4H/nVg3a4J6O950RGhugUDpJYE/PBAkCuXcochv3BJdz5bgr+/OB8uBsdq/l6+JruJY1PQDntVO0TAU5UhO7iOUjuCiR21zoCw=
20+
- secure: l6X7sHGQywSA45GVD/DXcdj0U73fGBYvyfiDNu8TUqCTYBuWAacVWYTkhenx04/0XwEdWta55XF6bBS0coPapRMsd8rOHQjSZBXA+CpxMCzS2bIMLwavmiFFqM2LyiUZZFjh/VkWK3428UCwM4nzgNUszwhB2Brxj0KbkU21j7tINE7mo4LzTekyEuUe3cWUYINSENk77HJkXjE+Tp4e1g/ArUEcdUiGJEAV2HdvlJ0pGGD9ioHJCzJt2jSAEgKgnVgGhutxDZYA5VhLanjzUq2D73YZ9UgB8iVyOrekWa7fKqewvMtr37d/yIy6WmhIe7dw+erTS6MK3XqzFEACpjJvGMD6bhuBLtbA7wlBjR8JFz7Zdez+n86WIrc4WZrans3eyo9FIJdzloELsj9FE2VVlm1q0gxKXDyPrt15b7TDJHS61RHX/g9zKB7GXmwsmk50y5p0UE1dRKknntGs5oNFmFHSrkB9loSMR93cEVs7LNQ5IRnSDuP+cYB88Pj6VZ303EvPNRVh7VKlXfOieahEt/FK/FUAvGoFDrjR3rtyauBSEr/q+ocBoSXxIA1ZgmpbCsK2lzAvt3dZl2H6FP8Ca924bvZ+OQfT3lN1JI2nEhw0EXf21NuXp7Jcqr6ua6DzoKeXIj0NMjRDOo8hpcPmxq4wHBPmjPQGdSU1pqE=

‎build.gradle‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ buildscript {
99
dependencies {
1010
classpath group: 'de.interactive_instruments', name: 'gradle-plugin-osgi-ipojo', version: '1.12.1.26'
1111
classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0"
12-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
12+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1313
}
1414
}
1515

1616
apply plugin: 'maven-publish'
1717
apply plugin: 'com.jfrog.bintray'
1818

19-
version = '1.0.5'
19+
version = '1.1.0'
2020

21-
version += '-SNAPSHOT'
21+
//version += '-SNAPSHOT'
2222

2323
group = 'de.interactive_instruments'
2424

2525
repositories {
26+
mavenLocal()
2627
mavenCentral()
2728
}
2829

@@ -44,13 +45,13 @@ subprojects {
4445
apply plugin: 'com.jfrog.bintray'
4546
apply plugin: 'license'
4647

47-
version = '1.0.0'
48+
version = '1.1.0'
4849

4950
//version += '-SNAPSHOT'
5051

5152
group = 'de.interactive_instruments'
5253

53-
sourceCompatibility = 1.7
54+
sourceCompatibility = 1.8
5455

5556
license {
5657
header rootProject.file('gradle/license-header')
@@ -189,13 +190,13 @@ subprojects {
189190

190191
dependencies {
191192
// TODO: get from root project, at least the versions
192-
provided group: 'de.interactive_instruments', name: 'xtraplatform-bundles-runtime', version: '1.0.3'
193+
provided group: 'de.interactive_instruments', name: 'xtraplatform-bundles-runtime', version: '1.1.0'
193194
// TODO: shouldn't we only be allowed to use api bundles here?
194-
provided group: 'de.interactive_instruments', name: 'xtraplatform-bundles-core', version: '1.0.4-SNAPSHOT'
195+
provided group: 'de.interactive_instruments', name: 'xtraplatform-bundles-core', version: '1.1.0'
195196

196197
// TODO: this is in bundles-runtime, but with transitive=false
197198
// TODO: we need the transitive dependencies in provided
198-
provided group: 'de.interactive_instruments', name: 'xtraplatform-dropwizard', version: '1.0.2'
199+
provided group: 'de.interactive_instruments', name: 'xtraplatform-dropwizard', version: '1.1.0'
199200
}
200201

201202
jar {
@@ -230,12 +231,12 @@ subprojects {
230231
user = project.bintrayUser
231232
key = project.bintrayApiKey
232233
publications = ['maven']
233-
publish = false
234+
publish = true
234235
pkg {
235236
repo = 'maven'
236237
name = project.name
237238
userOrg = 'iide'
238-
licenses = ['Apache-2.0']
239+
licenses = ['MPL-2.0']
239240
websiteUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools'
240241
issueTrackerUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools/issues'
241242
vcsUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools.git'
@@ -250,7 +251,7 @@ subprojects {
250251

251252
publishing {
252253
publications {
253-
maven(MavenPublication) {
254+
mavenRoot(MavenPublication) {
254255
pom.withXml{
255256
def dependenciesNode = asNode().appendNode('dependencies')
256257

@@ -275,13 +276,13 @@ publishing {
275276
bintray {
276277
user = project.bintrayUser
277278
key = project.bintrayApiKey
278-
publications = ['maven']
279-
publish = false
279+
publications = ['mavenRoot']
280+
publish = true
280281
pkg {
281282
repo = 'maven'
282283
name = project.name
283284
userOrg = 'iide'
284-
licenses = ['Apache-2.0']
285+
licenses = ['MPL-2.0']
285286
websiteUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools'
286287
issueTrackerUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools/issues'
287288
vcsUrl = 'https://github.com/interactive-instruments/XtraPlatform-SDI-Tools.git'
@@ -292,3 +293,5 @@ bintray {
292293
}
293294
}
294295
}
296+
297+
apply from: 'license-report.gradle'

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

‎license-report.gradle‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
apply plugin: 'com.github.hierynomus.license-report'
2+
3+
downloadLicenses {
4+
5+
ext.apacheTwo = license('Apache License, Version 2.0', 'http://opensource.org/licenses/Apache-2.0')
6+
ext.bsd = license('BSD License', 'http://www.opensource.org/licenses/bsd-license.php')
7+
ext.mit = license('MIT License', 'https://opensource.org/licenses/mit-license.php')
8+
ext.cddlgpl = license('CDDL + GPLv2 with classpath exception', 'https://javaee.github.io/glassfish/LICENSE')
9+
ext.epl = license('Eclipse Public License - Version 1.0', 'http://www.eclipse.org/org/documents/epl-v10.php')
10+
ext.lgpl = license('LGPL 2.1', 'http://www.gnu.org/licenses/lgpl-2.1.html')
11+
12+
13+
aliases = [
14+
(apacheTwo) : ['Apache Software License - Version 2.0', 'Apache License, version 2.0', 'The Apache License, Version 2.0', 'Apache Software Licenses', 'Apache 2.0', 'The Apache Software License, Version 2.0', 'Apache 2', 'Apache License Version 2.0', 'Apache License, Version 2.0', 'Apache License 2.0', license('Apache License 2.0', 'http://www.apache.org/licenses/LICENSE-2.0')],
15+
(bsd) : ['BSD', 'The New BSD License', 'BSD License', license('New BSD License', 'http://www.opensource.org/licenses/bsd-license.php')],
16+
(mit): ['MIT', 'MIT license', 'MIT License'],
17+
(cddlgpl): ['CDDL + GPLv2 with classpath exception', 'CDDL+GPL License', 'CDDL/GPLv2+CE', 'CDDL 1.1', 'GPL2 w/ CPE', 'CDDL v1.1 / GPL v2 dual license'],
18+
(epl): ['Eclipse Public License - Version 1.0', 'Eclipse Public License - v 1.0'],
19+
(lgpl): ['LGPL 2.1', 'GNU Lesser General Public License']
20+
]
21+
22+
licenses = [
23+
'org.json:json:20070829' : license('The JSON License', 'http://www.json.org/license.html'),
24+
'org.osgi:org.osgi.compendium:4.2.0': apacheTwo,
25+
'relaxngDatatype:relaxngDatatype:20020414': bsd
26+
]
27+
28+
excludeDependencies = [
29+
'de.interactive_instruments:xtraplatform-runtime:1.1.0',
30+
'de.interactive_instruments:xtraplatform-rest:1.1.0',
31+
'de.interactive_instruments:xtraplatform-ogc-csw-client:1.1.0',
32+
'de.interactive_instruments:xtraplatform-web-rest:1.1.0',
33+
'de.interactive_instruments:xtraplatform-util:1.1.0',
34+
'de.interactive_instruments:xtraplatform-api:1.1.0',
35+
'de.interactive_instruments:xtraplatform-kvstore-file:1.1.0',
36+
'de.interactive_instruments:xtraplatform-crs-transformation-geotools:1.1.0',
37+
'de.interactive_instruments:xtraplatform-openapi:1.1.0',
38+
'de.interactive_instruments:xtraplatform-web-static:1.1.0',
39+
'de.interactive_instruments:xtraplatform-kvstore-api:1.1.0',
40+
'de.interactive_instruments:xtraplatform-server:1.1.0',
41+
'de.interactive_instruments:xtraplatform-dropwizard:1.1.0',
42+
'de.interactive_instruments:xtraplatform-ogc-wfs-api:1.1.0',
43+
'de.interactive_instruments:xtraplatform-core:1.1.0',
44+
'de.interactive_instruments:xtraplatform-config-store:1.1.0',
45+
'de.interactive_instruments:xtraplatform-config-store-api:1.1.0',
46+
'de.interactive_instruments:xtraplatform-ogc-wfs-client:1.1.0',
47+
'de.interactive_instruments:xtraplatform-crs-api:1.1.0',
48+
'de.interactive_instruments:xtraplatform-logging-i18n:1.1.0',
49+
'de.interactive_instruments:xtraplatform-logging-i18n:1.1.0',
50+
'de.interactive_instruments:xtraplatform-openapi-viewer:1.1.0',
51+
'de.interactive_instruments:xtraplatform-kvstore-inmemory:1.1.0',
52+
'de.interactive_instruments:xtraplatform-sessions-api:1.1.0',
53+
'de.interactive_instruments:xtraplatform-firstrun:1.1.0',
54+
'de.interactive_instruments:xtraplatform-ogc-wfs-proxy:1.1.0',
55+
'de.interactive_instruments:xtraplatform-admin-rest:1.1.0',
56+
]
57+
dependencyConfiguration = 'embedded'
58+
}

‎xtraplatform-crs-api/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = '1.0.2'
1+
version = '1.1.0'
22
//version += '-SNAPSHOT'

‎xtraplatform-crs-transformation-geotools/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version = '1.1.0'
2+
//version += '-SNAPSHOT'
13

24
def rep = repositories.maven {
35
url "http://download.osgeo.org/webdav/geotools"
@@ -42,3 +44,6 @@ jar {
4244
instruction 'Embed-Transitive', 'true'
4345
}
4446
}
47+
48+
//apply from: 'license-report.gradle'
49+

‎xtraplatform-crs-transformation-geotools/license-report.gradle‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
apply plugin: 'com.github.hierynomus.license-report'
2+
3+
downloadLicenses {
4+
5+
ext.apacheTwo = license('Apache License, Version 2.0', 'http://opensource.org/licenses/Apache-2.0')
6+
ext.bsd = license('BSD License', 'http://www.opensource.org/licenses/bsd-license.php')
7+
ext.mit = license('MIT License', 'https://opensource.org/licenses/mit-license.php')
8+
ext.cddlgpl = license('CDDL + GPLv2 with classpath exception', 'https://javaee.github.io/glassfish/LICENSE')
9+
ext.epl = license('Eclipse Public License - Version 1.0', 'http://www.eclipse.org/org/documents/epl-v10.php')
10+
ext.lgpl = license('LGPL 2.1', 'http://www.gnu.org/licenses/lgpl-2.1.html')
11+
ext.hsqldb = license('HSQLDB License, based on BSD', 'http://hsqldb.org/web/hsqlLicense.html')
12+
13+
14+
aliases = [
15+
(apacheTwo): ['Apache Software License - Version 2.0', 'Apache License, version 2.0', 'The Apache License, Version 2.0', 'Apache Software Licenses', 'Apache 2.0', 'The Apache Software License, Version 2.0', 'Apache 2', 'Apache License Version 2.0', 'Apache License, Version 2.0', 'Apache License 2.0', license$
16+
(bsd): ['BSD', 'The New BSD License', 'BSD License', license('New BSD License', 'http://www.opensource.org/licenses/bsd-license.php')],
17+
(mit): ['MIT', 'MIT license', 'MIT License'],
18+
(cddlgpl): ['CDDL + GPLv2 with classpath exception', 'CDDL+GPL License', 'CDDL/GPLv2+CE', 'CDDL 1.1', 'GPL2 w/ CPE', 'CDDL v1.1 / GPL v2 dual license'],
19+
(epl): ['Eclipse Public License - Version 1.0', 'Eclipse Public License - v 1.0'],
20+
(lgpl): ['LGPL 2.1', 'GNU Lesser General Public License', 'Lesser General Public License (LGPL)'],
21+
(hsqldb): ['HSQLDB License, a BSD open source license', 'BSD License for HSQL']
22+
]
23+
24+
licenses = [
25+
'org.json:json:20070829' : license('The JSON License', 'http://www.json.org/license.html'),
26+
'org.osgi:org.osgi.compendium:4.2.0': apacheTwo,
27+
'relaxngDatatype:relaxngDatatype:20020414': bsd,
28+
'jgridshift:jgridshift:1.0': lgpl,
29+
'java3d:vecmath:1.3.2': license('Java Distribution License', 'http://cms.messe-berlin.de/license/license_jai.html'),
30+
'javax.media:jai_core:1.1.3': license('Java Distribution License', 'http://cms.messe-berlin.de/license/license_jai.html')
31+
]
32+
33+
excludeDependencies = [
34+
'de.interactive_instruments:xtraplatform-runtime:1.1.0',
35+
'de.interactive_instruments:xtraplatform-rest:1.1.0',
36+
'de.interactive_instruments:xtraplatform-ogc-csw-client:1.1.0',
37+
'de.interactive_instruments:xtraplatform-web-rest:1.1.0',
38+
'de.interactive_instruments:xtraplatform-util:1.1.0',
39+
'de.interactive_instruments:xtraplatform-api:1.1.0',
40+
'de.interactive_instruments:xtraplatform-kvstore-file:1.1.0',
41+
'de.interactive_instruments:xtraplatform-crs-transformation-geotools:1.1.0',
42+
'de.interactive_instruments:xtraplatform-openapi:1.1.0',
43+
'de.interactive_instruments:xtraplatform-web-static:1.1.0',
44+
'de.interactive_instruments:xtraplatform-kvstore-api:1.1.0',
45+
'de.interactive_instruments:xtraplatform-server:1.1.0',
46+
'de.interactive_instruments:xtraplatform-dropwizard:1.1.0',
47+
'de.interactive_instruments:xtraplatform-ogc-wfs-api:1.1.0',
48+
'de.interactive_instruments:xtraplatform-core:1.1.0',
49+
'de.interactive_instruments:xtraplatform-config-store:1.1.0',
50+
'de.interactive_instruments:xtraplatform-config-store-api:1.1.0',
51+
'de.interactive_instruments:xtraplatform-ogc-wfs-client:1.1.0',
52+
'de.interactive_instruments:xtraplatform-crs-api:1.1.0',
53+
'de.interactive_instruments:xtraplatform-logging-i18n:1.1.0',
54+
'de.interactive_instruments:xtraplatform-logging-i18n:1.1.0',
55+
'de.interactive_instruments:xtraplatform-openapi-viewer:1.1.0',
56+
'de.interactive_instruments:xtraplatform-kvstore-inmemory:1.1.0',
57+
'de.interactive_instruments:xtraplatform-sessions-api:1.1.0',
58+
'de.interactive_instruments:xtraplatform-firstrun:1.1.0',
59+
'de.interactive_instruments:xtraplatform-ogc-wfs-proxy:1.1.0',
60+
'de.interactive_instruments:xtraplatform-admin-rest:1.1.0'
61+
]
62+
63+
dependencyConfiguration = 'embedded'
64+
}
65+

‎xtraplatform-ogc-csw-client/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version = '1.0.0'
2-
version += '-SNAPSHOT'
1+
version = '1.1.0'
2+
//version += '-SNAPSHOT'
33

44
dependencies {
55
compile project(':xtraplatform-ogc-wfs-api')

‎xtraplatform-ogc-csw-client/src/test/java/de/ii/xtraplatform/ogc/csw/client/CSWAdapterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ public void testSomeMethod() {
4141
// OK
4242
List<String> urls = ImmutableList.of(
4343
//"http://geoportal.bayern.de/csw/bvv" // 8
44-
"http://gdk.gdi-de.org/gdi-de/srv/eng/csw" // 2595
44+
//"http://gdk.gdi-de.org/gdi-de/srv/eng/csw" // 2595
4545
//"https://geometadaten.lfrz.at/at.lfrz.discoveryservices/srv/de/csw202" // 2
4646
//"http://www.ign.es/csw-inspire/srv/eng/csw" // 3, has some more than can't be detected
4747
//"http://csw.geo.be/eng/csw" // 7, verified
4848
//"http://www.geodata-info.dk/registrant/srv/en/csw" // 17
4949
//"http://csw.data.gov.uk/geonetwork/srv/en/csw" // 96
5050
//"http://www.paikkatietohakemisto.fi/geonetwork/srv/eng/csw" // 0, wrong operation name, e.g. SYKEn INSPIRE-latauspalvelu, BETA
5151
//"https://inspirebg.eu/geonetwork/srv/eng/csw" // 0
52-
//"https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw-inspire" // 44
52+
"https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw-inspire" // 44
5353
//"http://snig.dgterritorio.pt/geoportal/csw/discovery" // 129
5454
//"http://inspire.maaamet.ee/geoportal/csw/discovery" // 2, some more with wrong operation name, e.g. Eesti Corine andmete allalaadimisteenus
5555
);

‎xtraplatform-ogc-wfs-api/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = '1.0.3'
1+
version = '1.1.0'
22
//version += '-SNAPSHOT'
33

44
dependencies {

0 commit comments

Comments
 (0)