Merge branch 'master-lcg93' into 'master'

Yet another attempt to switch to LCG 93

See merge request atlas/athena!10660

Former-commit-id: 4e438d41

Projects/AnalysisBase/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.2
+AnalysisBaseExternalsVersion = 2.0.3

Projects/AnalysisTop/externals.txt

 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = 2.0.2
+AnalysisBaseExternalsVersion = 2.0.3

Projects/AthDataQuality/externals.txt

@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.2
+AtlasExternalsVersion = 2.0.3

Projects/AthSimulation/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 8bb3de80
+AthSimulationExternalsVersion = 2.0.3
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v30r2.001

Projects/Athena/CMakeLists.txt

@@ -24,8 +24,8 @@ if( LCG_NIGHTLY )
     set( DQM-COMMON_VERSION "99-00-00" )
     set( TDAQ_VERSION "99-00-00" )
 else()
-    set( TDAQ-COMMON_VERSION "02-04-00" )
-    set( DQM-COMMON_VERSION "01-04-00" )
+    set( TDAQ-COMMON_VERSION "02-06-00" )
+    set( DQM-COMMON_VERSION "01-06-00" )
     set( TDAQ_VERSION "07-01-00" )
 endif()
 

Projects/Athena/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 8bb3de80
+AthenaExternalsVersion = 2.0.3
 
 # The version of atlas/Gaudi to use: 
 GaudiVersion = v30r2.001

Projects/Athena/externals/Rivet.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Rivet to use.
 #
 
-set( RIVET_VERSION 2.5.3 )
+set( RIVET_VERSION 2.6.0 )
 set( RIVET_ROOT
    ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/YODA.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of YODA to use.
 #
 
-set( YODA_VERSION 1.6.6 )
+set( YODA_VERSION 1.7.0 )
 set( YODA_ROOT
    ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )

graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h

@@ -14,7 +14,7 @@ class VP13DCocktailPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWid
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp13dcocktailplugin_vp1autofactory, VP13DCocktailPlugin_VP1AutoFactory)
   #endif

graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h

@@ -14,7 +14,7 @@ class VP1TrackCaloPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidg
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1trackcaloplugin_vp1autofactory, VP1TrackCaloPlugin_VP1AutoFactory)
   #endif

graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h

@@ -14,7 +14,7 @@ class VP1AODPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidgetFact
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1AODPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1AODPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1aodplugin_vp1autofactory, VP1AODPlugin_VP1AutoFactory)
   #endif

graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h

@@ -13,7 +13,7 @@ class VP1GeometryPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidge
   Q_OBJECT
 
   #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" FILE "") // apparently, FILE can be empty
+    Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" )
   # else
     Q_EXPORT_PLUGIN2(pnp_vp1geometryplugin_vp1autofactory, VP1GeometryPlugin_VP1AutoFactory)
   #endif