Skip to content

Commit

Permalink
Merge pull request #1057 from ZakarFin/release/2.13.0
Browse files Browse the repository at this point in the history 
Bump to 2.13 and remove refs to geoserver-rest-client
  • Loading branch information
@ZakarFin
ZakarFin authored Mar 15, 2024
2 parents c8bf0fe + b2311bc commit cef7b80
Show file tree
Hide file tree
Showing 56 changed files with 55 additions and 80 deletions.
7 changes: 1 addition & 6 deletions content-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>content-resources</artifactId>
<packaging>jar</packaging>
Expand All @@ -21,11 +21,6 @@
<groupId>org.oskari</groupId>
<artifactId>service-admin</artifactId>
</dependency>
<dependency>
<groupId>org.oskari</groupId>
<artifactId>geoserver-rest-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down
20 changes: 0 additions & 20 deletions content-resources/src/main/java/org/oskari/usercontent/UserDataLayerPopulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,24 +237,4 @@ public static int setupUserLayer(final String srs) {

return baseLayer.getId();
}

/**
* Calculate and set bounds for FeatureType based on it's CRS
* @param featureType
*/
protected static void resolveCRS(FeatureType featureType, String srs) {
featureType.srs = srs;
featureType.nativeCRS = srs;
try {
CoordinateReferenceSystem sys = CRS.decode(featureType.srs);
Envelope bounds = CRS.getEnvelope(sys);
featureType.setBounds(bounds.getLowerCorner().getOrdinate(Coordinate.X),
bounds.getUpperCorner().getOrdinate(Coordinate.X),
bounds.getLowerCorner().getOrdinate(Coordinate.Y),
bounds.getUpperCorner().getOrdinate(Coordinate.Y));
} catch (Exception e) {
LOG.warn(e, "Unable to setup native bounds for FeatureType:", featureType);
}
}

}
2 changes: 1 addition & 1 deletion control-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-admin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-announcements/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-announcements</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-example</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-mvt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-mvt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-myplaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-myplaces</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-rating/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion control-routing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-routing</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-statistics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-statistics</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion control-userlayer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>control-userlayer</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion control-users/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>control-users</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion download-basket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>download-basket</artifactId>
<name>Download Basket</name>
Expand Down
2 changes: 1 addition & 1 deletion geotools-ext/gt-geojson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>gt-geojson</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geotools-ext/gt-mif/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>gt-mif</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geotools-ext/gt-xsd-gpx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion model-ogcapi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>model-ogcapi</artifactId>
<description>Domain classes/value objects for working with OGC API services</description>
Expand Down
2 changes: 1 addition & 1 deletion oskari-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>oskari-utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
<packaging>pom</packaging>

<name>Oskari server</name>
Expand Down
2 changes: 1 addition & 1 deletion service-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-admin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-capabilities-update/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-capabilities-update</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-capabilities/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-capabilities</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-control/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-control</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-csw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-csw</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-feedback-open311/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>service-feedback-open311</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-feedback/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>service-feedback</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion service-logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion service-map/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-map</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-mvt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-mvt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-mybatis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-mybatis</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-myplaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-myplaces</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-permissions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-permissions</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-print/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>service-print</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion service-rating/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion service-routing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-routing</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-scheduler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-scheduler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-search-opendata/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>
<artifactId>service-search-opendata</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion service-search-wfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-search-wfs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service-search/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oskari</groupId>
<artifactId>oskari-server</artifactId>
<version>2.13.0-SNAPSHOT</version>
<version>2.13.0</version>
</parent>

<artifactId>service-search</artifactId>
Expand Down
Loading

0 comments on commit cef7b80

Please sign in to comment.