Skip to content

Commit

Permalink
Master is now 3.9.x.
Browse files Browse the repository at this point in the history
  • Loading branch information
@fxprunayre
fxprunayre committed Aug 26, 2019
1 parent a320b88 commit ead6818
Show file tree
Hide file tree
Showing 36 changed files with 44 additions and 37 deletions.
2 changes: 1 addition & 1 deletion cachingxslt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion csw-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion doi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion es/es-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>es</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>es-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion es/es-dashboards/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>es</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<profiles>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion es/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>es</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion events/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<name>GeoNetwork Events</name>
Expand Down
2 changes: 1 addition & 1 deletion harvesters/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion healthmonitor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion inspire-atom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions installer/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
</condition>

<property name="appName" value="geonetwork"/>
<property name="version" value="3.7.0-SNAPSHOT"/>
<property name="subVersion" value="0"/>
<property name="version" value="3.9.0"/>
<property name="subVersion" value="SNAPSHOT"/>
<property name="javaVersion" value="1.8.0"/>
<!-- Minimum version required -->
<property name="jre_url" value="http://openjdk.java.net/"/>
Expand Down
2 changes: 1 addition & 1 deletion jmeter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<!-- =========================================================== -->
<!-- Module Description -->
Expand Down
2 changes: 1 addition & 1 deletion listeners/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<name>GeoNetwork Events</name>
Expand Down
2 changes: 1 addition & 1 deletion messaging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion oaipmh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<packaging>pom</packaging>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
<name>GeoNetwork opensource</name>
<description>GeoNetwork opensource is a standards based, Free and
Open Source catalog application to manage spatially referenced
Expand Down
2 changes: 1 addition & 1 deletion release/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<artifactId>release</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion schemas-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion schemas/iso19115-3.2018
Submodule iso19115-3.2018 updated 33 files
+3 −3 README.md
+1 −13 src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java
+2 −2 src/main/plugin/iso19115-3.2018/convert/ISO19139/mapping/defaults.xsl
+90 −122 src/main/plugin/iso19115-3.2018/convert/ISO19139/toISO19139.xsl
+6 −6 src/main/plugin/iso19115-3.2018/convert/ogcwxs-info-injection.xsl
+3 −3 src/main/plugin/iso19115-3.2018/convert/ogcwxs-resp-party.xsl
+5 −15 src/main/plugin/iso19115-3.2018/convert/thesaurus-transformation.xsl
+110 −118 src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
+25 −71 src/main/plugin/iso19115-3.2018/index-fields/common.xsl
+6 −13 src/main/plugin/iso19115-3.2018/layout/config-editor.xml
+1 −1 src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-contact.xsl
+13 −45 src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-keywords.xsl
+6 −32 src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
+1 −1 src/main/plugin/iso19115-3.2018/layout/layout.xsl
+3 −4 src/main/plugin/iso19115-3.2018/layout/utility-tpl-multilingual.xsl
+4 −0 src/main/plugin/iso19115-3.2018/loc/fre/labels.xml
+2 −2 src/main/plugin/iso19115-3.2018/process/dq-report-add.xsl
+1 −1 src/main/plugin/iso19115-3.2018/process/inspire-add-conformity.xsl
+2 −2 src/main/plugin/iso19115-3.2018/process/onlinesrc-add.xsl
+2 −2 src/main/plugin/iso19115-3.2018/process/sibling-add.xsl
+2 −2 src/main/plugin/iso19115-3.2018/schema/standards.iso.org/19115/resources/transforms/ISO19139/toISO19139.xsl
+2 −2 src/main/plugin/iso19115-3.2018/templates/map.xml
+6 −12 src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
+4 −4 src/main/test/resources/inspire-test/iso19115-3/geosource-dataset.xml
+3 −3 src/main/test/resources/inspire-test/iso19115-3/geosource-discovery.xml
+2 −2 src/main/test/resources/inspire-test/iso19115-3/metawal-sample.xml
+12 −12 src/main/test/resources/inspire-test/iso19139/iso19139_dataset.xml
+11 −11 src/main/test/resources/inspire-test/iso19139/iso19139_discovery.xml
+3 −3 src/main/test/resources/inspire-test/iso19139/metawal-sample.xml
+25 −25 src/main/test/resources/medseatest.xml
+21 −21 src/main/test/resources/metadata-for-editing-light.xml
+21 −21 src/main/test/resources/metadata-for-editing.xml
+17 −17 src/main/test/resources/metadata-iso19139-for-editing.xml
4 changes: 2 additions & 2 deletions schemas/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<version>3.7</version>
Expand All @@ -55,7 +55,7 @@
</modules>
<properties>
<rootProjectDir>../..</rootProjectDir>
<gn.project.version>3.7.0-SNAPSHOT</gn.project.version>
<gn.project.version>3.9.0-SNAPSHOT</gn.project.version>
</properties>

</project>
2 changes: 1 addition & 1 deletion sde/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion slave/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<name>GeoNetwork Slave</name>
Expand Down
2 changes: 1 addition & 1 deletion web-ui-docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion web-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>

<groupId>org.geonetwork-opensource</groupId>
Expand Down
2 changes: 1 addition & 1 deletion web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down
5 changes: 5 additions & 0 deletions web/src/main/webResources/WEB-INF/config-db/database_migration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,5 +226,10 @@
<value>java:v370.HumanizeDatesUiMigration</value>
</list>
</entry>
<entry key="3.9.0">
<list>
<value>WEB-INF/classes/setup/sql/migrate/v390/migrate-</value>
</list>
</entry>
</util:map>
</beans>
4 changes: 2 additions & 2 deletions web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@ INSERT INTO Operations (id, name) VALUES (6,'featured');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/name', 'My GeoNetwork catalogue', 0, 110, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/siteId', '', 0, 120, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/organization', 'My organization', 0, 130, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/version', '3.7.0', 0, 150, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', '0', 0, 160, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/version', '3.9.0', 0, 150, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', 'SNAPSHOT', 0, 160, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/svnUuid', '', 0, 170, 'y');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/host', 'localhost', 0, 210, 'n');
INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/protocol', 'http', 0, 220, 'n');
Expand Down
2 changes: 2 additions & 0 deletions web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v390/migrate-default.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
UPDATE Settings SET value='3.9.0' WHERE name='system/platform/version';
UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion';
2 changes: 1 addition & 1 deletion workers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion workers/wfsfeature-harvester/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>workers</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion wro4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.9.0-SNAPSHOT</version>
</parent>


Expand Down

0 comments on commit ead6818

Please sign in to comment.