Skip to content

Commit

Permalink
Update to 3.0.1-SNAPSHOT version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
François Prunayre committed Apr 28, 2015
1 parent 8edefbc commit 260c575
Show file tree
Hide file tree
Showing 34 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 @@ -6,7 +6,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -6,7 +6,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -5,7 +5,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>


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 @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>e2e-tests</artifactId>
<packaging>pom</packaging>
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 @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<name>GeoNetwork Events</name>
Expand Down
2 changes: 1 addition & 1 deletion geoserver
Submodule geoserver updated 1 files
+1 −1 pom.xml
2 changes: 1 addition & 1 deletion harvesters/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -21,8 +21,8 @@
</condition>

<property name="appName" value="geonetwork"/>
<property name="version" value="3.0.0"/>
<property name="subVersion" value="0"/>
<property name="version" value="3.0.1"/>
<property name="subVersion" value="SNAPSHOT"/>
<property name="javaVersion" value="1.7.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 @@ -4,7 +4,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<!-- =========================================================== -->
<!-- Module Description -->
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 @@ -6,7 +6,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -5,7 +5,7 @@
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<packaging>pom</packaging>
<version>3.0.0-0</version>
<version>3.0.1-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 schemas-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion schemas/csw-record/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>schema-csw-record</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion schemas/dublin-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion schemas/iso19110/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion schemas/iso19139/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion schemas/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.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>schemas</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion schemas/schema-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sde/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -4,7 +4,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
8 changes: 4 additions & 4 deletions update-version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ echo

# Update SQL - needs improvements
echo 'SQL script'
sed $sedopt "s/'system/platform/version', '.*'/'system/platform/version', '${new_version_main}'/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
sed $sedopt "s/'system/platform/subVersion', '.*'/'system/platform/subVersion', '${sub_version}'/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
sed $sedopt "s/'system\/platform\/version', '.*', 0/'system\/platform\/version', '${new_version_main}', 0/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
sed $sedopt "s/'system\/platform\/subVersion', '.*', 0/'system\/platform\/subVersion', '${sub_version}', 0/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql

find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='${version}' WHERE name='system/platform/version'/value='${new_version_main}' WHERE name='system/platform/version'/g" {} \;
find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='.*' WHERE name='system/platform/subVersion'/value='${sub_version}' WHERE name='system/platform/subVersion'/g" {} \;
find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='${version}' WHERE name='system\/platform\/version'/value='${new_version_main}' WHERE name='system\/platform\/version'/g" {} \;
find . -wholename *v${version//[.]/}/migrate-default.sql -exec sed $sedopt "s/value='.*' WHERE name='system\/platform\/subVersion'/value='${sub_version}' WHERE name='system\/platform\/subVersion'/g" {} \;


# Update version pom files
Expand Down
2 changes: 1 addition & 1 deletion web-client/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.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>geonetwork-client</artifactId>
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.0.0-0</version>
<version>3.0.1-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 @@ -7,7 +7,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-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 @@ -5,7 +5,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>


Expand Down
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 @@ -554,8 +554,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.0.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.0.1', 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/v301/migrate-default.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
UPDATE Settings SET value='3.0.1' WHERE name='system/platform/version';
UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion';
5 changes: 5 additions & 0 deletions web/src/main/webapp/WEB-INF/config-db/database_migration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,10 @@
<value>WEB-INF/classes/setup/sql/migrate/v300/migrate-cswservice-</value>
</list>
</entry>
<entry key="3.0.1">
<list>
<value>WEB-INF/classes/setup/sql/migrate/v300/migrate-</value>
</list>
</entry>
</util:map>
</beans>
2 changes: 1 addition & 1 deletion wro4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.0.0-0</version>
<version>3.0.1-SNAPSHOT</version>
</parent>


Expand Down

0 comments on commit 260c575

Please sign in to comment.