This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new e3cad56f9 [DATALAB-3120]: Added update of maven version to 3.9.2
new ebeedb42e Merge pull request #1819 from OleksandrRepnikov/DATALAB-3120
e3cad56f9 is described below
commit e3cad56f90f8490af985acef3570419702fbed54
Author: Oleksandr <[email protected]>
AuthorDate: Mon Jun 12 17:59:49 2023 +0300
[DATALAB-3120]: Added update of maven version to 3.9.2
---
.../scripts/deploy_repository/deploy_repository.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 2 +-
pom.xml | 9 +++++++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 67f648c8a..dbbef5e3f 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -1337,7 +1337,7 @@ if __name__ == "__main__":
configuration[varname] = config.get(section, option)
groovy_version = '2.5.1'
nexus_version = '3.15.2-01'
- maven_version = '3.5.4'
+ maven_version = '3.9.2'
cuda_version_deeplearning = '8.0'
cuda_deeplearingn_file_name = 'cuda_8.0.44_linux-run'
cudnn_version_deeplearning = '6.0'
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 067a269bd..f159bfef1 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -378,7 +378,7 @@ def start_ss(keyfile, host_string, datalab_conf_dir,
web_path,
def install_build_dep():
try:
if not
exists(datalab.fab.conn,'{}tmp/build_dep_ensured'.format(os.environ['ssn_datalab_path'])):
- maven_version = '3.5.4'
+ maven_version = '3.9.2'
manage_pkg('-y install', 'remote', 'openjdk-8-jdk git wget unzip')
datalab.fab.conn.run(
'cd /opt/ && sudo wget
http://mirrors.sonic.net/apache/maven/maven-{0}/{1}/binaries/apache-maven-{1}-bin.zip
'
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 4ebed0f97..02f20fa6d 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -388,7 +388,7 @@ def start_ss(keyfile, host_string, datalab_conf_dir,
web_path,
def install_build_dep():
try:
if not
exists(conn,'{}tmp/build_dep_ensured'.format(os.environ['ssn_datalab_path'])):
- maven_version = '3.5.4'
+ maven_version = '3.9.2'
manage_pkg('-y install', 'remote', 'java-1.8.0-openjdk
java-1.8.0-openjdk-devel git wget unzip')
conn.sudo(
'cd /opt/ && wget
http://mirrors.sonic.net/apache/maven/maven-{0}/{1}/binaries/apache-maven-{1}-bin.zip'.format(
diff --git a/pom.xml b/pom.xml
index dc845f0b8..332efd762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,9 +121,9 @@
<org.mockito.version>1.10.19</org.mockito.version>
<java.version>1.8</java.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
- <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
- <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
+ <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven.build.timestamp.format>yyyy-MM-dd
HH:mm:ss</maven.build.timestamp.format>
<lombok.version>1.16.18</lombok.version>
<hibernate.validator.version>5.4.2.Final</hibernate.validator.version>
@@ -196,6 +196,11 @@
<finalName>${project.artifactId}-${datalab.version}</finalName>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
