You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/05/06 18:15:56 UTC
[sis] branch geoapi-4.0 updated (fa39844ccd -> 8e7b1a515c)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
discard fa39844ccd Upgrade dependency versions.
new 8e7b1a515c Upgrade dependency versions.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fa39844ccd)
\
N -- N -- N refs/heads/geoapi-4.0 (8e7b1a515c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide-project/NetBeans/nbproject/project.properties | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
[sis] 01/01: Upgrade dependency versions.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 8e7b1a515c4c29a768c8d2b30a4772ffa9f7c8cf
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri May 6 19:42:07 2022 +0200
Upgrade dependency versions.
---
application/sis-openoffice/pom.xml | 2 +-
cloud/sis-cloud-S3/pom.xml | 2 +-
core/sis-build-helper/pom.xml | 8 ++++----
core/sis-cql/pom.xml | 4 ++--
ide-project/NetBeans/nbproject/project.properties | 13 +++++++------
pom.xml | 21 ++++++++++-----------
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/application/sis-openoffice/pom.xml b/application/sis-openoffice/pom.xml
index b2138f20a1..30ac919837 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice</artifactId>
- <version>7.2.1</version>
+ <version>7.3.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/cloud/sis-cloud-S3/pom.xml b/cloud/sis-cloud-S3/pom.xml
index c4989439ef..21af1ab1bd 100644
--- a/cloud/sis-cloud-S3/pom.xml
+++ b/cloud/sis-cloud-S3/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
- <version>2.17.133</version>
+ <version>2.17.185</version>
</dependency>
</dependencies>
diff --git a/core/sis-build-helper/pom.xml b/core/sis-build-helper/pom.xml
index f8c3847a97..23132cabba 100644
--- a/core/sis-build-helper/pom.xml
+++ b/core/sis-build-helper/pom.xml
@@ -102,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.6.4</version>
<executions>
<execution>
<id>default-descriptor</id>
@@ -121,19 +121,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.8.4</version>
+ <version>3.8.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.8.4</version>
+ <version>3.8.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.2</version>
+ <version>3.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/sis-cql/pom.xml b/core/sis-cql/pom.xml
index 0322ada9b7..6674905482 100644
--- a/core/sis-cql/pom.xml
+++ b/core/sis-cql/pom.xml
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
- <version>4.9.3</version>
+ <version>4.10.1</version>
<executions>
<execution>
<id>run antlr</id>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.9.3</version>
+ <version>4.10.1</version>
<scope>compile</scope>
</dependency>
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index 0a5f02e6b4..40225666cc 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -101,10 +101,11 @@ project.GeoAPI = ../../../../GeoAPI/master/ide-project/NetBeans
#
jsr363.version = 1.0
jaxb.version = 2.3.3
+jaxb.runtime = 2.3.6
istack.version = 3.0.11
activation.version = 1.2.2
jama.version = 1.0.3
-geographlib.version = 1.52
+geographlib.version = 2.0
guava.version = 30.1-jre
re2j.version = 1.3
esri.api.version = 2.2.4
@@ -112,7 +113,7 @@ jts.version = 1.18.2
jdom2.version = 2.0.6
jee.version = 8.0.1
osgi.version = 6.0.0
-netcdf.version = 5.5.2
+netcdf.version = 5.5.3
joda-time.version = 2.10.3
httpclient.version = 4.5.13
httpcore.version = 4.4.13
@@ -122,8 +123,8 @@ junit.version = 4.13.2
hamcrest.version = 1.3
derby.version = 10.14.2.0
hsqldb.version = 2.6.1
-h2.version = 2.1.210
-postgresql.version = 42.3.3
+h2.version = 2.1.212
+postgresql.version = 42.3.5
#
# Classpaths for compilation, execution and tests.
@@ -160,8 +161,8 @@ javac.test.processorpath=\
${javac.test.classpath}
run.jaxb.classpath=\
${maven.repository}/jakarta/activation/jakarta.activation-api/${activation.version}/jakarta.activation-api-${activation.version}.jar:\
- ${maven.repository}/org/glassfish/jaxb/jaxb-runtime/${jaxb.version}/jaxb-runtime-${jaxb.version}.jar:\
- ${maven.repository}/org/glassfish/jaxb/txw2/${jaxb.version}/txw2-${jaxb.version}.jar:\
+ ${maven.repository}/org/glassfish/jaxb/jaxb-runtime/${jaxb.runtime}/jaxb-runtime-${jaxb.runtime}.jar:\
+ ${maven.repository}/org/glassfish/jaxb/txw2/${jaxb.runtime}/txw2-${jaxb.runtime}.jar:\
${maven.repository}/com/sun/istack/istack-commons-runtime/${istack.version}/istack-commons-runtime-${istack.version}.jar
run.netcdf.classpath=\
${maven.repository}/com/google/re2j/re2j/${re2j.version}/re2j-${re2j.version}.jar:\
diff --git a/pom.xml b/pom.xml
index 45237119c9..f53f303336 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>26</version>
</parent>
@@ -456,7 +456,7 @@
<dependency>
<groupId>net.sf.geographiclib</groupId>
<artifactId>GeographicLib-Java</artifactId>
- <version>1.52</version>
+ <version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -468,12 +468,12 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb.version}</version>
+ <version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
+ <version>2.3.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -498,13 +498,13 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.1.210</version>
+ <version>2.1.212</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.3.3</version>
+ <version>42.3.5</version>
<scope>test</scope>
</dependency>
@@ -518,7 +518,7 @@
<dependency>
<groupId>edu.ucar</groupId>
<artifactId>cdm-core</artifactId>
- <version>5.5.2</version>
+ <version>5.5.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -559,7 +559,6 @@
<sis.non-free.version>1.1</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
<javafx.version>17</javafx.version> <!-- Used only if "javafx" profile is activated. -->
<geoapi.version>4.0-SNAPSHOT</geoapi.version>
- <jaxb.version>2.3.3</jaxb.version>
</properties>
<profiles>
@@ -668,7 +667,7 @@
<!-- Compile -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
+ <version>3.10.1</version>
<configuration>
<release>${maven.compiler.target}</release>
<encoding>${project.build.sourceEncoding}</encoding>
@@ -684,7 +683,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>3.0.0-M6</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<includes>
@@ -858,7 +857,7 @@
<!-- JavaDoc configuration. -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.0</version>
<configuration>
<source>${maven.compiler.source}</source> <!-- Enables javadoc to handle language constructs present in target JDK. -->
<encoding>${project.build.sourceEncoding}</encoding> <!-- Encoding of Java source file. -->