[core] Update version files and clean up APIs marked for removal.

cmake/modules/RootConfiguration.cmake

@@ -161,10 +161,8 @@ set(davixlib ${DAVIX_LIBRARY})
 set(davixincdir ${DAVIX_INCLUDE_DIR})
 if(davix)
   set(hasdavix define)
-  set(useoldwebfile no)
 else()
   set(hasdavix undef)
-  set(useoldwebfile yes)
 endif()
 
 set(buildnetxng ${value${xrootd}})

config/mimes.unix.in

@@ -161,7 +161,7 @@ icon = rootdb_s.xpm rootdb_t.xpm
 action = THbookFile *ftmp = new THbookFile("%s")
 
 [root/tfile]
-pattern = TFile TNetFile TWebFile
+pattern = TFile
 icon = rootdb_s.xpm rootdb_t.xpm
 action = ->Browse()
 

config/mimes.win32.in

@@ -161,7 +161,7 @@ icon = rootdb_s.xpm rootdb_t.xpm
 action = THbookFile *ftmp = new THbookFile("%s")
 
 [root/tfile]
-pattern = TFile TNetFile TWebFile
+pattern = TFile
 icon = rootdb_s.xpm rootdb_t.xpm
 action = ->Browse()
 

config/rootrc.in

@@ -422,7 +422,7 @@ RSA.KeyType:  1
 # UsrPwd: check of host equivalence via /etc/hosts.equiv or $HOME/.rhosts.
 #SrvAuth.CheckHostsEquivalence: 1
 
-# Force file opening via TNetFile (TNetXNGFile) if a hostname is specified
+# Force file opening via TNetXNGFile if a hostname is specified
 # in the Url.
 # By default, for local files TFile::Open() invokes directly TFile
 #TFile.ForceRemote:  yes
@@ -452,14 +452,6 @@ TFile.CrossProtocolRedirects:  yes
 # correct value but instead used verbatim the value stored in the file.
 # TFile.v630forwardCompatibility: no
 
-# List of S3 servers known to support multi-range HTTP GET requests.
-# This is the value sent back by the S3 server in the 'Server:' header
-# of the HTTP response.
-# Please note that Amazon S3 servers do not support this feature.
-# Add one line per server type with syntax:
-# +TS3WebFile.Root.MultiRangeServer: Mucura
-TS3WebFile.Root.MultiRangeServer:  Huawei OBS
-
 # Special cases for the TUrl parser, where the special cases are parsed
 # in a protocol + file part, like file:/path/file.root or /alien/path/file.root.
 # In case the file namespace descriptor ends with - the namespace
@@ -531,9 +523,6 @@ NetXNG.QueryReadVParams: $(ROOT_XRD_QUERY_READV_PARAMS)
 # with all the goodies (session caching, flexible authentication, support
 # for different dialects like S3, and others)
 
-# Use the old TWebFile instead of the new libDavix based version
-Davix.UseOldClient: @useoldwebfile@
-
 # Verbosity level of the external Davix library
 # Davix.Debug: 0
 

core/base/inc/TROOT.h

@@ -378,10 +378,10 @@ friend TSeqCollection *ROOT::Deprecated::Internal::GetListOfSecContexts(const TR
    static const TString& GetDocDir();
    static const TString& GetMacroDir();
    static const TString& GetTutorialDir();
-   static const TString &GetSourceDir()
-      R__DEPRECATED(6, 42,
-                    "This function is removed because it made only sense in the corner case where the ROOT source is "
-                    "copied inside the ROOT installation, which is never the case unless the user does it by hand.");
+   static const TString &GetSourceDir() R__DEPRECATED(
+      7, 00,
+      "This function is without any effect because it made only sense in the corner case where the ROOT source is "
+      "copied inside the ROOT installation, which is never the case unless the user does it by hand.");
    static const TString& GetIconPath();
    static const TString& GetTTFFontDir();
 

core/base/src/TROOT.cxx

@@ -3481,23 +3481,12 @@ void TROOT::ShutDown()
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Get the source directory in the installation. Static utility function.
+/// \deprecated This function is without any effect because it made only sense in the corner case where the ROOT source
+/// is copied inside the ROOT installation, which is never the case unless the user does it by hand.
 
 const TString& TROOT::GetSourceDir() {
-#ifdef ROOTSRCDIR
-   if (IgnorePrefix()) {
-#endif
-      static TString rootsrcdir;
-      if (rootsrcdir.IsNull()) {
-         rootsrcdir = "src";
-         gSystem->PrependPathName(GetRootSys(), rootsrcdir);
-      }
-      return rootsrcdir;
-#ifdef ROOTSRCDIR
-   } else {
-      const static TString rootsrcdir = ROOTSRCDIR;
-      return rootsrcdir;
-   }
-#endif
+   static TString ret;
+   return ret;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

core/foundation/inc/ROOT/RConfig.hxx

@@ -458,7 +458,7 @@
 /*---- deprecation -----------------------------------------------------------*/
 #if defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
 # if (__GNUC__ == 5 && (__GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) || defined(R__NO_DEPRECATION)
-/* GCC 5.1, 5.2: false positives due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=15269 
+/* GCC 5.1, 5.2: false positives due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=15269
    or deprecation turned off */
 #   define _R__DEPRECATED_LATER(REASON)
 # else
@@ -477,15 +477,9 @@
 #define _R_DEPRECATED_REMOVE_NOW(REASON) __attribute__((REMOVE_THIS_NOW))
 #endif
 
-/* USE AS `R__DEPRECATED(6,40, "Not threadsafe; use TFoo::Bar().")`
-   To be removed by 6.40 */
-#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 39, 0)
-#define _R__DEPRECATED_640(REASON) _R__DEPRECATED_LATER(REASON)
-#else
-#define _R__DEPRECATED_640(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)
-#endif
-
-#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 41, 0)
+/* USE AS `R__DEPRECATED(6,42, "Not threadsafe; use TFoo::Bar().")`
+   To be removed by 6.42 */
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 41, 2)
 #define _R__DEPRECATED_642(REASON) _R__DEPRECATED_LATER(REASON)
 #else
 #define _R__DEPRECATED_642(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)

core/foundation/inc/ROOT/RVersion.hxx

@@ -3,8 +3,8 @@
 
 /* Update on release: */
 #define ROOT_VERSION_MAJOR 6
-#define ROOT_VERSION_MINOR 39
-#define ROOT_VERSION_PATCH 99  // When changing the version number here, never add leading zeroes!
+#define ROOT_VERSION_MINOR 41
+#define ROOT_VERSION_PATCH 1 // When changing the version number here, never add leading zeroes!
 #define ROOT_RELEASE_DATE "Apr 23 2026"
 
 /* Don't change the lines below. */

io/io/src/TFile.cxx

@@ -15,14 +15,15 @@
 \ingroup IO
 \brief A file, usually with extension .root, that stores data and code in the form of serialized objects in a
 file-system-like logical structure, possibly including subdirectory hierarchies.
-\note ROOT files contain data, and executable code, for example through TExec, TMacro, and TFormula instances. As for all files, **do not open ROOT files from an unknown origin!**
+\note ROOT files contain data, and executable code, for example through TExec, TMacro, and TFormula instances. As for
+all files, **do not open ROOT files from an unknown origin!**
 \note See also \ref IO
 \note See also \ref rootio (or `io/doc/TFile` folder in your codebase)
 
-ROOT files a are an efficient mean to store C++ class instances, e.g. data, 
-both as individual objects, in a so called *row-wise fashion*, and in a 
+ROOT files a are an efficient mean to store C++ class instances, e.g. data,
+both as individual objects, in a so called *row-wise fashion*, and in a
 *so-called columnar fashion*. Also executable code can be stored in ROOT files,
-for example in the form of TMacro, TExec or TFormula instances, and the 
+for example in the form of TMacro, TExec or TFormula instances, and the
 related federation of classes.
 
 For example, a TCanvas or TPad instance may rely on TExec instances stored in
@@ -3984,11 +3985,7 @@ TFile *TFile::Open(const char *url, Option_t *options, const char *ftitle,
             if ((h = gROOT->GetPluginManager()->FindHandler("TFile", name.Data()))) {
                if (h->LoadPlugin() == -1)
                   return nullptr;
-               TClass *cl = TClass::GetClass(h->GetClass());
-               if (cl && cl->InheritsFrom("ROOT::Deprecated::TNetFile"))
-                  f = (TFile*) h->ExecPlugin(5, name.Data(), option, ftitle, compress, netopt);
-               else
-                  f = (TFile*) h->ExecPlugin(4, name.Data(), option, ftitle, compress);
+               f = (TFile *)h->ExecPlugin(4, name.Data(), option, ftitle, compress);
             } else {
                // Just try to open it locally but via TFile::Open, so that we pick-up the correct
                // plug-in in the case file name contains information about a special backend (e.g.)

net/auth/src/TAuthenticate.cxx

@@ -24,8 +24,6 @@
 #include "THostAuth.h"
 #include "TRootSecContext.h"
 #include "TPluginManager.h"
-#include "TNetFile.h"
-#include "TPSocket.h"
 #include "TMessage.h"
 #include "TSystem.h"
 #include "TError.h"
@@ -35,9 +33,9 @@
 #include "TList.h"
 #include "NetErrors.h"
 #include "TRegexp.h"
+#include "TSocket.h"
 #include "TVirtualMutex.h"
 #include "TTimer.h"
-#include "TBase64.h"
 #include "strlcpy.h"
 #include "snprintf.h"
 

net/net/CMakeLists.txt

@@ -13,14 +13,10 @@ if(ssl)
 
   set(NET_SSL_HEADERS
     TSSLSocket.h
-    TS3HTTPRequest.h
-    TS3WebFile.h
   )
 
   set(NET_SSL_SOURCES
     src/TSSLSocket.cxx
-    src/TS3HTTPRequest.cxx
-    src/TS3WebFile.cxx
   )
 
   if(MACOSX_SSL_DEPRECATED)
@@ -36,18 +32,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
     TApplicationRemote.h
     TApplicationServer.h
     TFileStager.h
-    TFTP.h
-    TGrid.h
-    TGridCollection.h
-    TGridJDL.h
-    TGridJob.h
-    TGridJobStatus.h
-    TGridJobStatusList.h
-    TGridResult.h
     TMessage.h
     TMonitor.h
-    TNetFile.h
-    TNetFileStager.h
     TParallelMergingFile.h
     TPServerSocket.h
     TPSocket.h
@@ -62,24 +48,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
     TSQLStatement.h
     TSQLTableInfo.h
     TUDPSocket.h
-    TWebFile.h
     ${NET_SSL_HEADERS}
   SOURCES
     src/NetErrors.cxx
     src/TApplicationRemote.cxx
     src/TApplicationServer.cxx
     src/TFileStager.cxx
-    src/TFTP.cxx
-    src/TGrid.cxx
-    src/TGridJDL.cxx
-    src/TGridJob.cxx
-    src/TGridJobStatus.cxx
-    src/TGridJobStatusList.cxx
-    src/TGridResult.cxx
     src/TMessage.cxx
     src/TMonitor.cxx
-    src/TNetFile.cxx
-    src/TNetFileStager.cxx
     src/TParallelMergingFile.cxx
     src/TPServerSocket.cxx
     src/TPSocket.cxx
@@ -94,7 +70,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
     src/TSQLStatement.cxx
     src/TSQLTableInfo.cxx
     src/TUDPSocket.cxx
-    src/TWebFile.cxx
     ${NET_SSL_SOURCES}
   DICTIONARY_OPTIONS
     -writeEmptyRootPCM

net/net/inc/LinkDef.h

@@ -14,35 +14,19 @@
 #pragma link C++ enum ESockOptions;
 #pragma link C++ enum ESendRecvOptions;
 
-#pragma link C++ global ROOT::Deprecated::gGrid;
-#pragma link C++ global gGridJobStatusList;
-
 #pragma link C++ class TServerSocket;
 #pragma link C++ class TSocket;
 #pragma link C++ class TPServerSocket;
 #pragma link C++ class TPSocket;
 #pragma link C++ class TMessage;
 #pragma link C++ class TMonitor;
-#pragma link C++ class ROOT::Deprecated::TNetFile;
-#pragma link C++ class ROOT::Deprecated::TNetFileStager;
-#pragma link C++ class ROOT::Deprecated::TNetSystem;
-#pragma link C++ class ROOT::Deprecated::TWebFile;
-#pragma link C++ class ROOT::Deprecated::TWebSystem;
-#pragma link C++ class ROOT::Deprecated::TFTP;
 #pragma link C++ class TSQLServer;
 #pragma link C++ class TSQLResult;
 #pragma link C++ class TSQLRow;
 #pragma link C++ class TSQLStatement;
 #pragma link C++ class TSQLTableInfo;
 #pragma link C++ class TSQLColumnInfo;
 #pragma link C++ class TSQLMonitoringWriter;
-#pragma link C++ class ROOT::Deprecated::TGrid;
-#pragma link C++ class ROOT::Deprecated::TGridResult+;
-#pragma link C++ class ROOT::Deprecated::TGridJDL+;
-#pragma link C++ class ROOT::Deprecated::TGridJob+;
-#pragma link C++ class ROOT::Deprecated::TGridJobStatus+;
-#pragma link C++ class ROOT::Deprecated::TGridJobStatusList+;
-#pragma link C++ class ROOT::Deprecated::TGridCollection+;
 #pragma link C++ class ROOT::Deprecated::TSecContext;
 #pragma link C++ class ROOT::Deprecated::TSecContextCleanup;
 #pragma link C++ class TFileStager;
@@ -52,16 +36,7 @@
 #pragma link C++ class TParallelMergingFile+;
 
 #ifdef R__SSL
-#pragma link C++ class ROOT::Deprecated::TS3HTTPRequest+;
-#pragma link C++ class ROOT::Deprecated::TS3WebFile+;
 #pragma link C++ class TSSLSocket;
 #endif
 
-#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection"
-#pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL"
-#pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob"
-#pragma read sourceClass="TGridJobStatus" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatus"
-#pragma read sourceClass="TGridJobStatusList" version="[-1]" targetClass="ROOT::Deprecated::TGridJobStatusList"
-#pragma read sourceClass="TGridResult" version="[-1]" targetClass="ROOT::Deprecated::TGridResult"
-
 #endif