Merge branch 'V9_9_BR'

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

diff --git a/HELLO_version.h.in b/HELLO_version.h.in
index 488c62cb18c53c6cc54a49f759343776f35a901b..cdf78ceb58b56631686f31da4b7c17d5d787de1f 100644 (file)
--- a/HELLO_version.h.in
+++ b/HELLO_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/SalomeHELLOConfig.cmake.in b/SalomeHELLOConfig.cmake.in
index 7e7aa5ef2325c4e7517dc6cbf6293ae38f15d54f..7c73d47d2bcd019d71d6607f6e9e8fdc93040dc0 100644 (file)
--- a/SalomeHELLOConfig.cmake.in
+++ b/SalomeHELLOConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 82018f66e49b7adb090fdcc01907a673bff05992..62b98c4f42272d9bf4f9ca4f90076d0aa107a03f 100644 (file)
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 6fa5e9121ce6404e500d328cf7dfd15516d895b9..a884393105c1163ff760a7725b8eaae673553571 100644 (file)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/adm_local/cmake_files/FindSalomeHELLO.cmake b/adm_local/cmake_files/FindSalomeHELLO.cmake
index 4ca4a530f5c3875d82013a0f984795da95d3d65a..c52c83e8eb71c1a0a88c607861ad3ed9f0c9007e 100644 (file)
--- a/adm_local/cmake_files/FindSalomeHELLO.cmake
+++ b/adm_local/cmake_files/FindSalomeHELLO.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
index 495a7e9f6b68eebf948f497b248edae35422b947..0cf0198e1e6d0cc3e9891bdc848dcdb813a3e71b 100644 (file)
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
index 39fa929a11155c9042d241d81c8696c90aeaf82f..0f150a09d2926efc5832adf84bb0eab0dd6d0453 100644 (file)
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index a8808d06272660133ddcff4e0f5566468c2c9308..7b5e77cea9d6ff25ada2b790f1963ad862ff098a 100644 (file)
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/adm_local/unix/config_files/check_HELLO.m4 b/adm_local/unix/config_files/check_HELLO.m4
index d0a6a1e1c5d22230cf8268d7e851d33d4f4a1b45..8893237a5d22c5c42a617c5696fe850eefb2d083 100644 (file)
--- a/adm_local/unix/config_files/check_HELLO.m4
+++ b/adm_local/unix/config_files/check_HELLO.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 7b0ecc1e9921def57e9259205fc9385bc2587d9b..ffbf96fea48acb8d8f3f463a2e82159fddfe22a4 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/bin/runHELLO.in b/bin/runHELLO.in
index 0bd26773dada5248ee3cdcb397f5d49818909c7a..2bb4285857753f12c6b74b1748588a182577cc9d 100755 (executable)
--- a/bin/runHELLO.in
+++ b/bin/runHELLO.in
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/bin/runHELLO.py b/bin/runHELLO.py
index 5ab8e69199022adfdf4728241293a8e8b14805e4..6b5e438d29ca405a20e249fe28dcd320b2c9b80a 100755 (executable)
--- a/bin/runHELLO.py
+++ b/bin/runHELLO.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/bin/test_hello.py b/bin/test_hello.py
index 411311df4955e6f365bb3ee2e989a9b1257583a4..a1eabd4c6de972cf51b13073fbb048ad6ac2c7e2 100644 (file)
--- a/bin/test_hello.py
+++ b/bin/test_hello.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 766d4451e1750c05419f6b1ac4d2c78b37fedef5..8957c69d2d860c5ee2954e983550103a98463f18 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/doc/static/footer.html b/doc/static/footer.html
index ee4bfe92b40aa0fa8322c7d8dcb7203f9eab8c9a..a3aa22695947385420ca467f4a6da954d5967c6d 100644 (file)
--- a/doc/static/footer.html
+++ b/doc/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2021  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+      Copyright &copy; 2007-2022  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
       Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
     </li>
   </ul>

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 417978a1a6b78f7cecf1e66e2b1a6d93bc19a1c1..7c089a63833b38676f92ea647ebdf59df0d810ee 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/HELLO_Gen.idl b/idl/HELLO_Gen.idl
index 165177f735b5014e2059d832c3e555f64183fb7c..01c746b753217e5466d4ccbb4cb35151e9b7ece7 100644 (file)
--- a/idl/HELLO_Gen.idl
+++ b/idl/HELLO_Gen.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 69768ce09ef96cc5d3508f2f75a68452f582da50..abf1092b36da8baa8b301b977afa6fa22cafcc74 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a99818bc2e196a540e7945db9f4e2947b7e3991c..80488ee27c4da0ccfb0ef8ab3a40219a6d67a9f3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/HELLO/CMakeLists.txt b/src/HELLO/CMakeLists.txt
index e265b0888e2f1e5d1669a1d2056c84463ef5d364..a3dcf3501e0527ce7eae879314915451306b80fa 100644 (file)
--- a/src/HELLO/CMakeLists.txt
+++ b/src/HELLO/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx
index e16ae67c96a33b16fe172365720f560139ad72c0..95c77194bafbe5ae6cd8aaa76e7922f16035faa7 100644 (file)
--- a/src/HELLO/HELLO.cxx
+++ b/src/HELLO/HELLO.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index f55129051b66e8620186d4e9f9631bc11eaf3e57..ecf3bd687660a0951501dc553b929489fc2642c9 100644 (file)
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/HELLOGUI/CMakeLists.txt b/src/HELLOGUI/CMakeLists.txt
index dca00426cb81378961ddc34b2a2e9379b04837a2..4392109b6b6c2da4bffb8bc3a21d4418ec10fcca 100644 (file)
--- a/src/HELLOGUI/CMakeLists.txt
+++ b/src/HELLOGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx
index f4b4d30b8d6cd74a81cb150b9b3e5dfd6a3fe4b8..7d8ea9d002a8d2a0efc818663934cce5c0138a0f 100644 (file)
--- a/src/HELLOGUI/HELLOGUI.cxx
+++ b/src/HELLOGUI/HELLOGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/HELLOGUI/HELLOGUI.h b/src/HELLOGUI/HELLOGUI.h
index 3c6a2145c28a137198b1f4a8cfca36779490a20f..d6d2213316953aa2656bf01f600dca1c9778799b 100644 (file)
--- a/src/HELLOGUI/HELLOGUI.h
+++ b/src/HELLOGUI/HELLOGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS