Skip to content

Commit

Permalink
Bump versions on master for release-branch (#10533)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
github-actions[bot] and github-actions authored Oct 2, 2024
1 parent dc5a043 commit 6f1d3b9
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 34 deletions.
2 changes: 1 addition & 1 deletion binary/bin-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-bin-war</artifactId>
<packaging>war</packaging>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
<name>MapStore 2 Release Module WAR</name>
<description>Creates the war for the binary package, adding customization (e.g. h2 database)</description>
<url>http://www.geo-solutions.it</url>
Expand Down
20 changes: 8 additions & 12 deletions binary/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-root</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>
<groupId>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-binary</artifactId>
Expand Down Expand Up @@ -116,13 +115,11 @@
<phase>package</phase>
<configuration>
<tasks>
<echo message="Downloading JRE..."/>
<get src="https://www.dropbox.com/scl/fi/1joi5d3ol2zeex5cle2tg/jdk_11_0_23.tar.gz?rlkey=4vsmejq23xkpctsw6qifs6of6&amp;st=k4xtzt68&amp;dl=1"
dest="${project.build.directory}/jre.tar.gz"/>
<echo message="Untar JRE..."/>
<gunzip src="${project.build.directory}/jre.tar.gz"
dest="${project.build.directory}/jre.tar"/>
<untar src="${project.build.directory}/jre.tar" dest="${project.build.directory}/jre"/>
<echo message="Downloading JRE..." />
<get src="https://www.dropbox.com/scl/fi/1joi5d3ol2zeex5cle2tg/jdk_11_0_23.tar.gz?rlkey=4vsmejq23xkpctsw6qifs6of6&amp;st=k4xtzt68&amp;dl=1" dest="${project.build.directory}/jre.tar.gz" />
<echo message="Untar JRE..." />
<gunzip src="${project.build.directory}/jre.tar.gz" dest="${project.build.directory}/jre.tar" />
<untar src="${project.build.directory}/jre.tar" dest="${project.build.directory}/jre" />
</tasks>
</configuration>
<goals>
Expand All @@ -135,8 +132,7 @@
<!-- remove some unwanted dependencies that get pulled over -->
<tasks>
<delete>
<fileset dir="${project.build.directory}/dependency"
includes="servlet-api-*.jar,core*.jar"/>
<fileset dir="${project.build.directory}/dependency" includes="servlet-api-*.jar,core*.jar" />
</delete>
</tasks>
</configuration>
Expand Down
5 changes: 2 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-root</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>

<groupId>it.geosolutions.mapstore</groupId>
Expand Down
5 changes: 2 additions & 3 deletions java/printing/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-java</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>

<groupId>it.geosolutions.mapstore</groupId>
Expand Down
5 changes: 2 additions & 3 deletions java/services/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-java</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>

<groupId>it.geosolutions.mapstore</groupId>
Expand Down
5 changes: 2 additions & 3 deletions java/web/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-java</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>

<groupId>it.geosolutions.mapstore</groupId>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mapstore2",
"version": "0.9.0",
"version": "0.10.0",
"description": "MapStore 2",
"repository": "https:/geosolutions-it/MapStore2",
"main": "index.js",
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-root</artifactId>
<packaging>pom</packaging>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
<name>MapStore Root</name>

<properties>
Expand Down
7 changes: 3 additions & 4 deletions product/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-root</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
</parent>
<groupId>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-product</artifactId>
Expand All @@ -16,7 +15,7 @@
<datadir.location>${env.MAPSTORE_DATA_DIR}</datadir.location>
<security.integration>default</security.integration>
<!-- <backend.debug.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000</backend.debug.args> -->
<backend.debug.args></backend.debug.args>
<backend.debug.args />

</properties>

Expand Down
2 changes: 1 addition & 1 deletion project/standard/templates/web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomcat.version>8.5.69</tomcat.version>
<tomcat.port>8080</tomcat.port>
<mapstore-services.version>1.8-SNAPSHOT</mapstore-services.version>
<mapstore-services.version>1.9-SNAPSHOT</mapstore-services.version>
<geostore-webapp.version>2.1-SNAPSHOT</geostore-webapp.version>
<http_proxy.version>1.6-SNAPSHOT</http_proxy.version>
<print-lib.version>2.3.1</print-lib.version>
Expand Down

0 comments on commit 6f1d3b9

Please sign in to comment.