Merge branch 'V9_9_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 188e11def29d337fcd37318d11c8db7e2be23419..5dadf246dd83a3262c670b0080cb15085bee4b53 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.8.0)
+SALOME_SETUP_VERSION(9.9.0)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL

diff --git a/SalomeGENERICSOLVERConfig.cmake.in b/SalomeGENERICSOLVERConfig.cmake.in
index e1b5e3858a62a7de14b3d7d64a9454a566148a10..6c425547ffdc425691673946e9511e4b4ad0f02d 100644 (file)
--- a/SalomeGENERICSOLVERConfig.cmake.in
+++ b/SalomeGENERICSOLVERConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2012-2021  EDF R&D
+# Copyright (C) 2012-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index f6e91288ba20b2a7211221fe285b1bcb11c61f79..eee822f7582f5f1a4e6afc48650890c9d20ed405 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/idl/DEVIATION_Gen.idl b/idl/DEVIATION_Gen.idl
index f5ea1bbf525e056287258d9437a68aaa21b36c43..5835514f468ba19531094eb5860b22d1c27a484f 100644 (file)
--- a/idl/DEVIATION_Gen.idl
+++ b/idl/DEVIATION_Gen.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021  EDF R&D
+// Copyright (C) 2009-2022  EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/idl/GENERICSOLVER_Gen.idl b/idl/GENERICSOLVER_Gen.idl
index 89935652460875b60f5b6cb4fdf020fc8f700bf5..72321db97754d197b2371f980239c2c013fb4a09 100644 (file)
--- a/idl/GENERICSOLVER_Gen.idl
+++ b/idl/GENERICSOLVER_Gen.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021  EDF R&D
+// Copyright (C) 2009-2022  EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 5e45480eab27cdc3d8ecdfa89ee324b7a507178a..4cab9dbedf526ce86070a94361db13eacce30a5c 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/yacsgen_example.py b/resources/yacsgen_example.py
index 080f4dade05ec7424a0db2dd8d318d62bbb11203..d18e387b036a122053f24cb54f957d563bf12445 100755 (executable)
--- a/resources/yacsgen_example.py
+++ b/resources/yacsgen_example.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c017153e896d41ca76538bf83bb30c0a92b35edf..3387fff4d31304a02cc3567506d592a9a4534957 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GENERICSOLVER/CMakeLists.txt b/src/GENERICSOLVER/CMakeLists.txt
index 7e763500f57aa7fe19b80fe79fb432dddd7787ef..bebb37f72f4cb4f1779638fe0ff49800e223e5ef 100644 (file)
--- a/src/GENERICSOLVER/CMakeLists.txt
+++ b/src/GENERICSOLVER/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py
index 3b0babdf3e7bcea376d177b4f35e59314f4f3346..c725e929dbb331340f8d9c63e2bb0bb962bf3dbb 100644 (file)
--- a/src/GENERICSOLVER/DEVIATION.py
+++ b/src/GENERICSOLVER/DEVIATION.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GENERICSOLVER/GENERICSOLVER.py b/src/GENERICSOLVER/GENERICSOLVER.py
index c53c3f19935fdb43f62226b9695f97bc4228f7f4..16f48c36ca3f47aeb60e2f257818fdcca0b186bd 100644 (file)
--- a/src/GENERICSOLVER/GENERICSOLVER.py
+++ b/src/GENERICSOLVER/GENERICSOLVER.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GENERICSOLVERGUI/CMakeLists.txt b/src/GENERICSOLVERGUI/CMakeLists.txt
index 481a5d1f44ef6106246bfb1420cae3e4b0e797f6..41a937387d45dbdd1cac3a95698169ebcb617bcb 100644 (file)
--- a/src/GENERICSOLVERGUI/CMakeLists.txt
+++ b/src/GENERICSOLVERGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
index dda81add22fecdc0a71dc15e746106673e63da57..672eeef4b9ccd4b15ef19f1bbd73c7e909f8a035 100644 (file)
--- a/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
+++ b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  EDF R&D
+# Copyright (C) 2009-2022  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public