Skip to content

Commit

Permalink
Rename fi.nls.oskari -> org.oskari groupId
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZakarFin
ZakarFin committed Sep 1, 2020
1 parent fb7fe2d commit 4ebc5c1
Show file tree
Hide file tree
Showing 78 changed files with 515 additions and 594 deletions.
15 changes: 7 additions & 8 deletions content-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.oskari</groupId>
<artifactId>content-resources</artifactId>
<packaging>jar</packaging>
<name>Content Resources</name>

<dependencies>
<dependency>
<groupId>org.oskari</groupId>
<artifactId>service-admin</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>service-admin</artifactId>
</dependency>
<dependency>
<groupId>org.oskari</groupId>
<artifactId>geoserver-rest-client</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
31 changes: 15 additions & 16 deletions control-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,40 @@
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>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-admin</artifactId>
<artifactId>control-admin</artifactId>
<packaging>jar</packaging>
<name>Control Service - Admin Actions</name>

<dependencies>

<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-control</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-map</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-map</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>service-logging</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-search-wfs</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-search-wfs</artifactId>
</dependency>
<dependency>
<groupId>org.oskari</groupId>
<artifactId>service-capabilities-update</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<groupId>org.oskari</groupId>
<artifactId>control-base</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -47,8 +46,8 @@
</dependency>

<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-users</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-users</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
Expand Down Expand Up @@ -92,7 +91,7 @@
</dependency>

<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
39 changes: 19 additions & 20 deletions control-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,52 @@
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>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<artifactId>control-base</artifactId>
<packaging>jar</packaging>
<name>Control Service - Base Actions</name>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-control</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-search-wfs</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-search-wfs</artifactId>
</dependency>

<dependency>
<groupId>org.oskari</groupId>
<artifactId>service-admin</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-myplaces</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-myplaces</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-map</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-map</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-feedback</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-feedback</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-feedback-open311</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-feedback-open311</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<groupId>org.oskari</groupId>
<artifactId>service-csw</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-rating</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-rating</artifactId>
</dependency>
<dependency>
<groupId>org.oskari</groupId>
Expand All @@ -61,7 +60,7 @@
<artifactId>service-userlayer</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
17 changes: 8 additions & 9 deletions control-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@
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>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-example</artifactId>
<artifactId>control-example</artifactId>
<packaging>jar</packaging>
<name>Control Service - Platform specific/example Actions</name>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<groupId>org.oskari</groupId>
<artifactId>control-base</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-search-opendata</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-search-opendata</artifactId>
</dependency>

<dependency>
Expand All @@ -30,7 +29,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
19 changes: 9 additions & 10 deletions control-mvt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.oskari</groupId>
<artifactId>control-mvt</artifactId>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-control</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<groupId>org.oskari</groupId>
<artifactId>control-base</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-map</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-map</artifactId>
</dependency>
<dependency>
<groupId>org.oskari</groupId>
Expand All @@ -37,7 +36,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
17 changes: 8 additions & 9 deletions control-myplaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@
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>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-myplaces</artifactId>
<artifactId>control-myplaces</artifactId>
<packaging>jar</packaging>
<name>Control Service - My places Actions</name>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<groupId>org.oskari</groupId>
<artifactId>control-base</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-myplaces</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-myplaces</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -35,7 +34,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
17 changes: 8 additions & 9 deletions control-rating/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>oskari-parent</artifactId>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-rating</artifactId>
<artifactId>control-rating</artifactId>
<packaging>jar</packaging>
<name>Control Service - Rating Actions</name>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-base</artifactId>
<groupId>org.oskari</groupId>
<artifactId>control-base</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-rating</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-rating</artifactId>
</dependency>

<dependency>
Expand All @@ -30,7 +29,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
17 changes: 8 additions & 9 deletions control-routing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,31 @@
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>fi.nls.oskari</groupId>
<artifactId>oskari-parent</artifactId>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control-routing</artifactId>
<artifactId>control-routing</artifactId>
<packaging>jar</packaging>
<name>Control Service - Action routes for routing</name>

<dependencies>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-routing</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-routing</artifactId>
</dependency>
<dependency>
<groupId>fi.nls.oskari.service</groupId>
<artifactId>oskari-control</artifactId>
<groupId>org.oskari</groupId>
<artifactId>service-control</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fi.nls.oskari</groupId>
<groupId>org.oskari</groupId>
<artifactId>shared-test-resources</artifactId>
<scope>test</scope>
</dependency>
Expand Down
Loading

0 comments on commit 4ebc5c1

Please sign in to comment.