summaryrefslogtreecommitdiff
path: root/java-compat/src
diff options
context:
space:
mode:
Diffstat (limited to 'java-compat/src')
-rw-r--r--java-compat/src/Glacier2/build.gradle4
-rw-r--r--java-compat/src/Glacier2/src/main/java/Glacier2/Application.java4
-rw-r--r--java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java4
-rw-r--r--java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java4
-rw-r--r--java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java4
-rw-r--r--java-compat/src/Ice/build.gradle4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/AMDCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Application.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/AsyncResult.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/BatchRequest.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Blobject.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ByteHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ByteOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ClassResolver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ConnectionI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Dispatcher.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Exception.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/FloatHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/FloatOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/FormatType.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Holder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/InitializationData.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/InputStream.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/IntHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/IntOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LocalException.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LoggerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LongHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/LongOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Object.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectReader.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Optional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/OptionalObject.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/OutputStream.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/PluginFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/PropertiesI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Request.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ShortHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ShortOptional.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/SliceInfo.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/SlicedData.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/StringHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/SystemException.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TieBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/UserException.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Util.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java4
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/BZip2.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Buffer.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Connector.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Ex.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Incoming.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Instance.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Network.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Property.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Protocol.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Reference.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RetryException.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Selector.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ServantError.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Time.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/Util.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/Observer.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/Instance.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/Plugin.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/PluginI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java4
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java4
-rw-r--r--java-compat/src/IceBT/build.gradle4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/Instance.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/PluginI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/IceBT/Util.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java4
-rw-r--r--java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java4
-rw-r--r--java-compat/src/IceBox/build.gradle4
-rw-r--r--java-compat/src/IceBox/src/main/java/IceBox/Admin.java4
-rw-r--r--java-compat/src/IceBox/src/main/java/IceBox/Server.java4
-rw-r--r--java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java4
-rw-r--r--java-compat/src/IceDiscovery/build.gradle4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java4
-rw-r--r--java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java4
-rw-r--r--java-compat/src/IceGrid/build.gradle4
-rw-r--r--java-compat/src/IceLocatorDiscovery/build.gradle4
-rw-r--r--java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java4
-rw-r--r--java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java4
-rw-r--r--java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java4
-rw-r--r--java-compat/src/IcePatch2/build.gradle4
-rw-r--r--java-compat/src/IceStorm/build.gradle4
343 files changed, 343 insertions, 1029 deletions
diff --git a/java-compat/src/Glacier2/build.gradle b/java-compat/src/Glacier2/build.gradle
index f69070e8130..fa583f91fce 100644
--- a/java-compat/src/Glacier2/build.gradle
+++ b/java-compat/src/Glacier2/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "Glacier2 Compat"
project.ext.description = "Firewall traversal for Ice"
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
index 58abc8e17da..4290c68eab4 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Glacier2;
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java
index 7bf53bde46a..07ef49ff7fc 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Glacier2;
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
index 7925df1728d..fd140101a38 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Glacier2;
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
index 7b8e12703b2..a8e7dfe7629 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Glacier2;
diff --git a/java-compat/src/Ice/build.gradle b/java-compat/src/Ice/build.gradle
index 633a93a971b..7731da83a73 100644
--- a/java-compat/src/Ice/build.gradle
+++ b/java-compat/src/Ice/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "Ice Compat"
project.ext.description = "Ice is a comprehensive RPC framework that helps you build distributed applications" +
diff --git a/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java b/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java
index d01a470d66e..f1bcdfe29d2 100644
--- a/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java b/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java
index 3bea07fd53b..706c95e5524 100644
--- a/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java
+++ b/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Application.java b/java-compat/src/Ice/src/main/java/Ice/Application.java
index b7b71ea1d98..911e38f81a0 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Application.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Application.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java b/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java
index 0c74958f727..6fa7109c130 100644
--- a/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java b/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java
index 4678039c219..c7ba85df79a 100644
--- a/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java
+++ b/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java b/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java
index 0a43c0c0220..333890c9091 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java b/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java
index 7a6cabd7053..c39fb77b23c 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Blobject.java b/java-compat/src/Ice/src/main/java/Ice/Blobject.java
index a1371b07729..6f87ff5a413 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Blobject.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Blobject.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
index ee5595b7a4c..9d9dc2322de 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java b/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java
index 82dfa786022..22145d431c3 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java b/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java
index 697af760f9e..4d0f5af353b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java b/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java
index 2eb4719bfab..4d70b40d175 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java b/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java
index cbcfe8c12ca..bc890a2a5b8 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback.java b/java-compat/src/Ice/src/main/java/Ice/Callback.java
index c422e3bf0ae..5f964152a4e 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java
index dd476844382..b12a017d17d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java
index c860575e5d4..570e12b7aa5 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java
index cd6864c42ba..d3268109873 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java
index 00a0c659624..3e7e5c94e3d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java
index 002a03d62f1..6e994f38101 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java
index fccc5315d31..60a726a724a 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java
index a99a35b2e20..ef9217a90b0 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java
index 9e4c21ae29e..25becf43edf 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java
index e55398ddc36..7b25c190057 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java
index c4fe706e728..c5b41eb372c 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java b/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java
index 7314f1e1395..451fb03b7a9 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java
index 7b3377678ff..447d96649ec 100644
--- a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java b/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java
index bfb7e4c3275..9e08e8fb0b1 100644
--- a/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java
+++ b/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
index 834c69588c3..85d7b141361 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java
index 36e23d62fa2..8735ff7eea6 100644
--- a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java
+++ b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java
index c9eead808c5..b4e60b6a890 100644
--- a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java b/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java
index fad60e665ee..74757cea7f3 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java b/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java
index 4bfe17251f8..286519270e7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java b/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java
index 62b8334f242..0136daeb869 100644
--- a/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Exception.java b/java-compat/src/Ice/src/main/java/Ice/Exception.java
index 477987ea66d..cc7ad2daa0b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Exception.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Exception.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java b/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java
index be7c2d194c2..61314002751 100644
--- a/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java b/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java
index f092048cff2..3963b4f52be 100644
--- a/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/FormatType.java b/java-compat/src/Ice/src/main/java/Ice/FormatType.java
index c80e0ab63f4..a728c2d52c1 100644
--- a/java-compat/src/Ice/src/main/java/Ice/FormatType.java
+++ b/java-compat/src/Ice/src/main/java/Ice/FormatType.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Holder.java b/java-compat/src/Ice/src/main/java/Ice/Holder.java
index 7799bc86b62..6d3b3853b14 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Holder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Holder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java b/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java
index ecc8ac09981..3a040eb96e9 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/InitializationData.java b/java-compat/src/Ice/src/main/java/Ice/InitializationData.java
index e5937c36c82..5d4daf6ddf8 100644
--- a/java-compat/src/Ice/src/main/java/Ice/InitializationData.java
+++ b/java-compat/src/Ice/src/main/java/Ice/InitializationData.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java
index 8a549ff1bb2..ebdcdc9e3fd 100644
--- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java
+++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/IntHolder.java b/java-compat/src/Ice/src/main/java/Ice/IntHolder.java
index 282d755720a..6413f16091f 100644
--- a/java-compat/src/Ice/src/main/java/Ice/IntHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/IntHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/IntOptional.java b/java-compat/src/Ice/src/main/java/Ice/IntOptional.java
index b728ed2673e..b4f5f376fb7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/IntOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/IntOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LocalException.java b/java-compat/src/Ice/src/main/java/Ice/LocalException.java
index 7e208d4b017..6295ec2ecf0 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LocalException.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LocalException.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java b/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java
index ec4f50c1157..facd8c5238e 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java
index 8d4864530dd..c4cec714b61 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java b/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java
index 683457b8346..bd8454c7ddc 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LongHolder.java b/java-compat/src/Ice/src/main/java/Ice/LongHolder.java
index 78895033228..baa4e867103 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LongHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LongHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/LongOptional.java b/java-compat/src/Ice/src/main/java/Ice/LongOptional.java
index b77f80aed58..cb23cae5ebb 100644
--- a/java-compat/src/Ice/src/main/java/Ice/LongOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/LongOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java b/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java
index 6234c07f3f4..f6e9917b2df 100644
--- a/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java
+++ b/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Object.java b/java-compat/src/Ice/src/main/java/Ice/Object.java
index 8bd0175363c..de445cf3bf0 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Object.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Object.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java
index 70f0473940c..0c72c7f9f99 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java b/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java
index 63590907d8a..f983ad7d6b0 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java b/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java
index e1739bb690a..39587072f96 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
index 7a4d9c4fd02..3909d3cff8b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java b/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java
index 72f51d61fc6..7a133ba44fe 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java
index 194a080e303..65d4a3e24bf 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java
index 5fbc9e1ce5b..e32c96573fc 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
index e001ede8ed3..28789a6158c 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java
index 264d67c3c4a..55d502b2cb4 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java b/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java
index c413eaec1a2..c684b2cbba8 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java b/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java
index 8cddb5e5b0d..8c37a81b190 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java b/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java
index b74f046d947..7735021a704 100644
--- a/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Optional.java b/java-compat/src/Ice/src/main/java/Ice/Optional.java
index c3f486366dd..71e9f0f2ccf 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Optional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Optional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java b/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java
index 82485d27709..c6a8d71d4f5 100644
--- a/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java
+++ b/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java b/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java
index 5886abde8d6..3c8d0d58a8f 100644
--- a/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java
+++ b/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java
index 23c5ab1db17..c87de5cccf7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java
+++ b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java b/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java
index 8c9e833ec37..ad363e810e2 100644
--- a/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java
+++ b/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java b/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java
index b5cbb2b13f9..f306b385a82 100644
--- a/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java b/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java
index 7343d335563..f5c2c05814f 100644
--- a/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java b/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java
index 5f21cc47784..230a419589b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java b/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java
index 2da33468a43..227d5f2e585 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java b/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java
index 419cf8a87f8..a93f1009b87 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java b/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java
index 6eade5f7e84..0bcacfc3ec3 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Request.java b/java-compat/src/Ice/src/main/java/Ice/Request.java
index 856410bcd0c..e11df3a234e 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Request.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Request.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java b/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java
index b12e0bcb392..f898bb109d3 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java b/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java
index c6618877e70..35fcdfef189 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java b/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java
index f4d6c4d69f0..34dfd2331c7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java
+++ b/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java b/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java
index 0e070308ffc..58138deb050 100644
--- a/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java
+++ b/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/SlicedData.java b/java-compat/src/Ice/src/main/java/Ice/SlicedData.java
index 4610f22ae26..a00c344ff18 100644
--- a/java-compat/src/Ice/src/main/java/Ice/SlicedData.java
+++ b/java-compat/src/Ice/src/main/java/Ice/SlicedData.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/StringHolder.java b/java-compat/src/Ice/src/main/java/Ice/StringHolder.java
index e60337bcb32..8582a1548b4 100644
--- a/java-compat/src/Ice/src/main/java/Ice/StringHolder.java
+++ b/java-compat/src/Ice/src/main/java/Ice/StringHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java b/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java
index 079f7a3f54d..50998afd702 100644
--- a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/SystemException.java b/java-compat/src/Ice/src/main/java/Ice/SystemException.java
index d4db1d6f6fb..721311c56ed 100644
--- a/java-compat/src/Ice/src/main/java/Ice/SystemException.java
+++ b/java-compat/src/Ice/src/main/java/Ice/SystemException.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java b/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java
index e673debc5de..c15691ce8dd 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java b/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java
index 55192da3a58..12cd133fccc 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TieBase.java b/java-compat/src/Ice/src/main/java/Ice/TieBase.java
index 864d8ed1fe8..0c3c7c390fe 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TieBase.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TieBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java
index 9c32de864cb..8832ef78fe7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java
index 379dce23428..91f237a8baf 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java
index f351db899ab..475f81852e7 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java
index 38696e2c3dd..d5217b69957 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java
index 9ff74e9c86e..c604b547136 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java
index ab0f5c084b9..412ca805886 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java
index d215a14ce4b..ae7e227c32f 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java
index 0a85771050c..d41a3a4741a 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java
index 6837849ccfe..588df93d13a 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java
index c8a32643120..d4b41ea0690 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java
index 1c6e7f4fbae..6b632e8f2fb 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java
index fc56ded4fb4..8556e820127 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java
index 0c067137bf8..ffb372c5486 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java
index 4198ba3d2e3..249ce89351c 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java
index a8e237409ac..96998ff0a23 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java
index 1ddd99d7e5a..3ce623fb99b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java
index 1b5e395ecdc..520c016b91d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java
index 94e6d301c49..2e71de5f369 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java
index de0d72b10cd..ae203021cde 100644
--- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java
+++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
index c0c1745ad90..3e0095eaa9e 100644
--- a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
+++ b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/UserException.java b/java-compat/src/Ice/src/main/java/Ice/UserException.java
index 4487ec839b8..0b76b08cf88 100644
--- a/java-compat/src/Ice/src/main/java/Ice/UserException.java
+++ b/java-compat/src/Ice/src/main/java/Ice/UserException.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java b/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java
index 381e5543b35..c31d1003d81 100644
--- a/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java
+++ b/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Util.java b/java-compat/src/Ice/src/main/java/Ice/Util.java
index 4a48dbdfb7c..e57be1cf5bf 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Util.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Util.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java b/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java
index 0d271a156fe..1e10159f973 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java b/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java
index 27d1975db2f..d1603c3883d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java
+++ b/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java b/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java
index ea64bdb1c7b..715add239d8 100644
--- a/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java
+++ b/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package Ice;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java b/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
index 830efd8f927..211547a4c48 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java
index 79b318c2fee..ae42605d9a4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java b/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java
index 7b2cb5da707..44adfd18813 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java b/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java
index 96f30978fe1..98cec6f21c6 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java b/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java
index 4c4fdd5132a..74ab19c7c94 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java b/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java
index 0d24a80ad10..a1b8ea607db 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java b/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java
index f3d5dd8a698..7a22bf2ce0c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java b/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java
index 02667e080d8..6b32769cd0b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java b/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java
index 08cf5e3c835..8e625cbc97c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java b/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java
index c782aa67ffb..9091946fd4b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java
index fd6d352d8ff..1422a7214a6 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java
index bfe413b2f9f..2cab2d9d231 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java
index 2dd62e1e6f9..b9cc8a60a53 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java b/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java
index cf8b6336d03..34cf7c060cb 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java
index 22dad4622e2..373ff111401 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java
index d9c7035f0ca..d710763a38c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java
index 41784471fab..efb8cdcb966 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java
index 49fef9c4034..2b3b19a14a3 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java
index 8e3e203a139..9cd1dc3fba4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java
index 785d7b928ae..63139c0a325 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Connector.java b/java-compat/src/Ice/src/main/java/IceInternal/Connector.java
index c542bdd7182..c5ce8d1d6bd 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Connector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Connector.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java b/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java
index d699eb4c1e2..e0a9696dbb2 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java b/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java
index 85ec82878fd..ab6b25746e0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java
index 45e0057037c..7bd31d13c2f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java b/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java
index 4b171ebd6e2..b237a02b9e2 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java
index 4ce93e7017c..2faa6af56dc 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java
index 75611dbc01e..7a64a9382d7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java
index a6f661883ba..ad99c92086e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
index 2047fe9c3fb..4182a8395a8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java
index 30a6fee7f05..701d32444e8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java
index 8907862174e..6cc7fd1352f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java b/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java
index 459ddbc5cce..38b4f39564f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java
index 675dd162750..44d91c14f22 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java b/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java
index fcb6d4aaef2..5593351c5ab 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
index cfdd93d1fd6..6c3708c4e94 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java
index 04e1f4f1357..833f7009083 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java b/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java
index ed87e5f9515..058eae8bffb 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java
index 4b4dfe9cc4d..29801dce7b3 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java
index 3dd0040f74b..1879458f8ec 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java
index 45a1916916c..4b5e5241bd8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java
index ecfcd9938f5..22949408791 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java
index 43cd987ae50..d7ca3ac2d26 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java
index ac1279b38fd..7d58ace08d8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java
index 913778c36a2..d90c221b20a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java
index 83b6a91b86e..5442f5e2846 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java
index 0cd8cecd951..260e1696022 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java
index 96489010110..cb22216653a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java
index 086846d545c..179b684f187 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java
index 807b0badc66..96aa9e8a688 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java
index 00e854ea2cb..a4c14fb122d 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java
index 19d15571a31..4844782a885 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java
index 22b0565b39c..056e9a4427c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java
index 633d0953f2d..dc97dc1fd9c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java
index 39704dfb677..c9422c299e2 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java
index fefab3904a8..c71172db2cd 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java
index 630a3abbc30..6820161caed 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java
index 6f092e470b5..0c9885ebff0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java
index 8bf90e35492..130621b0e1f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java
index e6ec0b6dfb5..1d1519a1d89 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java
index 1a21ad7f67c..7e74f94abdf 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java
index 24f34ea5caf..9ca46a6c762 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java
index 0bd33bd3a0c..8d8cbf3e235 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java
index 9e5e82a1b32..0d06d5ef5a5 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java
index 4d627366599..2723efddcd4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java
index bf780edb60f..4b6651fc71a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java
index 9b2fd2e253f..2402ca49b2b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java
index a99853388bc..6790436dd2a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java b/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java
index f988c9dc3a9..d5ce30a1ef0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java b/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java
index 0b013d177d0..144f0376216 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java b/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java
index 84c9b2fab62..e90962b9b27 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java
index e293ba8a266..af0dd54233e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java
index 6daa117e2bb..31c906031a5 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java
index 0faf767ab5c..e87b13fe005 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java
index fe34beb1a73..b9164f983f7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
index 15cd955d81e..a7a488b2f4b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java b/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java
index 0dd1ee19893..25caac01616 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Instance.java b/java-compat/src/Ice/src/main/java/IceInternal/Instance.java
index e7e9155b705..80f1607758c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Instance.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Instance.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java
index 2f88788c9a8..30cd18bad80 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java b/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java
index 6ff7e39dfda..c0910af0260 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java
index 7c4e1940e63..2e880ffd8f5 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java b/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java
index d7f697f9c52..d611d5a4208 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java b/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java
index 4cba02ee3c3..47f13d1948f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java
index a229c126d4f..84e061a1483 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java
index 17f10e8654b..06949d2ebd0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java
index 579153b1815..781d8cb4b84 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java
index c212215f783..8787ab120f4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java b/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java
index 9dad31d3e85..e28439aa489 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java b/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java
index 7657feab3b7..68e5b92e063 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Network.java b/java-compat/src/Ice/src/main/java/IceInternal/Network.java
index 7d6177a1915..6216f9a2d68 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Network.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Network.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java b/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java
index 04d3061a8a3..da4fbaadb97 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java
index 83592991fec..fef85270db7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java b/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java
index 5532b1c0628..a8d8cf276bc 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java b/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java
index c8645ac5fde..4c9bdbf96c6 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
index 8caae68b9c6..306861bb4d7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java
index bc9cd58a618..f84912f3f33 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java
index 5949db3cbe3..649a038b78d 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
index 7c4bad2886a..2d6ad01791b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java b/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java
index 1e355ccacd5..27b52d821ff 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java b/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java
index 03dfc5d7882..f55f0146868 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java
index 343c388c5f2..5cb4728fc67 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Property.java b/java-compat/src/Ice/src/main/java/IceInternal/Property.java
index 2c2bfe72a46..e28e1896a82 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Property.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Property.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
index 42d5dea274e..44147ce3ff6 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java b/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java
index 522a2c74ead..b787cf71880 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
index 822aa884ab2..33183ac2b25 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java
index 5de8d62b741..953151c0a80 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java
index b21c63e1ead..60c92f0a15e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
index 42ffd494795..fc1306ebf1a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java
index 49ac9a62e87..4e68c018a86 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
index 0b676b5cf56..c0f183e6380 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
index 067baddee73..9fa8928bfec 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java b/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java
index d773c019152..9fbe21b10ff 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java
index b795a3feba0..152dcb88750 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java
index f3534b62e27..c7fe0696d5a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java
index 112fc439181..0de214adf2e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java
index 929912e9942..ca3ce11b089 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java
index bda89f8c07b..9e0721f5c58 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java b/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java
index 2a7480bb09c..1a08de8e500 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java
index 4a86a00d0d8..e0ae67e683f 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java
index 022a6a97d10..cfb17425b81 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java
index b218c362bc7..0a80776e5f3 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java b/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java
index 4aa3c4d4ef8..068011af4db 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java b/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java
index 3db88dd930f..aaedda38498 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java b/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java
index 0f54af5a656..c727d512a8a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java b/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java
index 4964759a189..4270f1622da 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java b/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java
index 4d565a5e79a..62cbd08bb8e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java b/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java
index c41d238a2d1..ac4f643a66b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java b/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java
index c313465f4b4..0bc40a32132 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
index 4483c70b63c..1e8b4ef20c0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java b/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java
index bc340c77cec..1823d4917d4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java b/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java
index 943afeae70e..e8e70025172 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java b/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java
index 601572a0538..e86d5eace32 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java b/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java
index 7f8d2bba943..14ba05545de 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java
index 7e2ae9d7482..e83486eda15 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java b/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java
index fe862feffd9..5d8b8e24b1c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java b/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java
index c1c0a09ec4d..eaf0c2492a7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java
index 0b4a154536c..5ee35c16250 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java
index b29f322c0d2..aad9b6e5fb0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java
index 2552ad9505d..cc81c24e9f1 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java
index 667a440a887..d221a900059 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java
index 65cea8b3915..be846572dee 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java
index ad7052335b8..4a13088a488 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java
index e113890e9fe..1ce08c101e8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java
index f02e545e3f6..5b14d26f0f8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Time.java b/java-compat/src/Ice/src/main/java/IceInternal/Time.java
index 37691916b7b..1b3202fbe09 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Time.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Time.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java b/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java
index 5a3aa2e4c7c..ce069914ad1 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java
index 9eece85e233..f8b3db771cc 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java
index cedc763c6d2..6019cd48679 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java
index f6dfe70f9f4..af3a4e4dc30 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java
index 2d88e0a4185..ae293da8e61 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java
index 7b783b3121e..84b6ec60282 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
index 7938b92367b..bfe641aeb6c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java
index d4a0f9c29dd..59e521cc5a4 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java
index fd6fe98aa89..15abb5ad2d0 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
index 91dad400404..ed026c9f76b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java
index 84129780e94..b7bb10b2c4d 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Util.java b/java-compat/src/Ice/src/main/java/IceInternal/Util.java
index fdb0e4fa756..57756043fa3 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Util.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Util.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java b/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java
index 8a700c67515..286e2c00493 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java b/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java
index e00c4a99227..50ef58c336c 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java b/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java
index a2ad8a89543..eeae42b3a46 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java b/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java
index a86065322df..d7e287e5951 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java b/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java
index ed896861b13..4cf466f008e 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java
index 28fae6edf0d..09216b57719 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java
index b6386c0acba..a02f6fbcf7d 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java b/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java
index e6e383da48b..f82640dfd19 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java b/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java
index 9906c70097a..ea0ea9127ce 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/Observer.java b/java-compat/src/Ice/src/main/java/IceMX/Observer.java
index 856a1e94c6f..e1b012aa0d0 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/Observer.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/Observer.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java b/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java
index 602e1004a33..6c6e572f313 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java b/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java
index 4970e366bba..36111bd8f7a 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java b/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java
index 252b1e7993e..70b5ad320df 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java b/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java
index 2da57c9a0d6..67c12e89201 100644
--- a/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java
+++ b/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceMX;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java b/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java
index 29a360eb815..c7be8eacf3d 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java b/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java
index d0e1623ca3f..ce75bf6bd89 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java b/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java
index 11e18ff96c2..58f0aacd960 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java b/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java
index 28de7c8a4db..dd8f74cac3e 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java b/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java
index 9187e06116b..f5c00c84d97 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/Instance.java b/java-compat/src/Ice/src/main/java/IceSSL/Instance.java
index 6b11a681e57..c31650e8d4c 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/Instance.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/Instance.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java b/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java
index 54e0cc3b893..7e0e88c52cd 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java b/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java
index 063483d2303..3114c9daa26 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java b/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java
index cd5aa30d1aa..e9fa39ce809 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java b/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java
index 97f6895ac95..13457557a1c 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java b/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java
index b23aa551fd2..274c9d45103 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java
index 3bc4bcacd42..53a0dfa6539 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java
index 193b15c391b..9dc9b57de17 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java b/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java
index 5916daab482..937bc56fcd4 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java b/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java
index a2f1fbbc409..4bbd2e900f6 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java b/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java
index 83bfebc7163..531e310903e 100644
--- a/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java
+++ b/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceSSL;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java
index 54a18e4347a..ee837afebee 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java
index ca6f7ca0e8f..16870c3227d 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
index 31e06c4c603..e2ba6156e26 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java
index 31b90f348ff..2357d7ac2bb 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java
index 9a3d4fb682b..9ef887b32d5 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java
index 229f09f4deb..103a97625e8 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java
index 31955ec86d5..e98189262a2 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceUtilInternal;
diff --git a/java-compat/src/IceBT/build.gradle b/java-compat/src/IceBT/build.gradle
index 6f1f2de3a27..7a0002cb7d7 100644
--- a/java-compat/src/IceBT/build.gradle
+++ b/java-compat/src/IceBT/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceBT Compat"
project.ext.description = "Bluetooth support for Ice"
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java b/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java
index 3165f483bd5..f81a3e43922 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java b/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java
index 0d442d37cbb..0cf8d275686 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java b/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java
index e1ff8fa8c45..b909737c52d 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java b/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java
index a48a52bbaa3..db0093a0063 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/Instance.java b/java-compat/src/IceBT/src/main/java/IceBT/Instance.java
index 954116b5729..a0866889f80 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/Instance.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/Instance.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java b/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java
index 781775eb53a..be22a4e97ac 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java b/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java
index 1ccfba24a3f..b76562911da 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java b/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java
index 3fda18319bf..01f40dbe542 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/IceBT/Util.java b/java-compat/src/IceBT/src/main/java/IceBT/Util.java
index 5ff427349f1..ed26eb827bc 100644
--- a/java-compat/src/IceBT/src/main/java/IceBT/Util.java
+++ b/java-compat/src/IceBT/src/main/java/IceBT/Util.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBT;
diff --git a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java
index d497ca7baf1..830ee450f27 100644
--- a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java
+++ b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff --git a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java
index d433411dc05..cc0bfa48de3 100644
--- a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java
+++ b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff --git a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java
index cedb483e361..7eec3f67eb6 100644
--- a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java
+++ b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff --git a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java
index 2732ff95b98..e130a624e14 100644
--- a/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java
+++ b/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff --git a/java-compat/src/IceBox/build.gradle b/java-compat/src/IceBox/build.gradle
index eab720e5821..97aaeeaac9b 100644
--- a/java-compat/src/IceBox/build.gradle
+++ b/java-compat/src/IceBox/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceBox Compat"
project.ext.description = "IceBox is an easy-to-use framework for Ice application services"
diff --git a/java-compat/src/IceBox/src/main/java/IceBox/Admin.java b/java-compat/src/IceBox/src/main/java/IceBox/Admin.java
index 8447be1de8d..c4841686666 100644
--- a/java-compat/src/IceBox/src/main/java/IceBox/Admin.java
+++ b/java-compat/src/IceBox/src/main/java/IceBox/Admin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBox;
diff --git a/java-compat/src/IceBox/src/main/java/IceBox/Server.java b/java-compat/src/IceBox/src/main/java/IceBox/Server.java
index 880e5cda215..67d3a166c96 100644
--- a/java-compat/src/IceBox/src/main/java/IceBox/Server.java
+++ b/java-compat/src/IceBox/src/main/java/IceBox/Server.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBox;
diff --git a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
index b5012efe555..1952c936f1f 100644
--- a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
+++ b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceBox;
diff --git a/java-compat/src/IceDiscovery/build.gradle b/java-compat/src/IceDiscovery/build.gradle
index 02dda9d6c83..27e0170974a 100644
--- a/java-compat/src/IceDiscovery/build.gradle
+++ b/java-compat/src/IceDiscovery/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceDiscovery Compat"
project.ext.description = "Allow Ice applications to discover objects and object adapters"
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java
index 30ad1a1c455..e29daf994df 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java
index f648a6b84e6..7f83cfba98c 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
index 0d2079ad2eb..9cd5446c0c7 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java
index 392760861cb..221a1fd88b3 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java
index 1c6347e955c..45356f7d216 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java
index 9f29e7ed8a8..68d9668c556 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceDiscovery;
diff --git a/java-compat/src/IceGrid/build.gradle b/java-compat/src/IceGrid/build.gradle
index 81958f62e53..1e4b21300e8 100644
--- a/java-compat/src/IceGrid/build.gradle
+++ b/java-compat/src/IceGrid/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceGrid Compat"
project.ext.description = "Locate, deploy, and manage Ice servers"
diff --git a/java-compat/src/IceLocatorDiscovery/build.gradle b/java-compat/src/IceLocatorDiscovery/build.gradle
index 2fa03cedf49..6d77c1cbce0 100644
--- a/java-compat/src/IceLocatorDiscovery/build.gradle
+++ b/java-compat/src/IceLocatorDiscovery/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceLocatorDiscovery Compat"
project.ext.description = "Ice plug-in that enables the discovery of IceGrid and custom locators via UDP multicast"
diff --git a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java
index 0da70447dde..4571f51b9fe 100644
--- a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java
+++ b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceLocatorDiscovery;
diff --git a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java
index d3b81fa9e9b..3812fd624c9 100644
--- a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java
+++ b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceLocatorDiscovery;
diff --git a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java
index 06f5925b7ba..8939c2b9d6d 100644
--- a/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java
+++ b/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
package IceLocatorDiscovery;
diff --git a/java-compat/src/IcePatch2/build.gradle b/java-compat/src/IcePatch2/build.gradle
index b6f9855dcd6..974c52424ff 100644
--- a/java-compat/src/IcePatch2/build.gradle
+++ b/java-compat/src/IcePatch2/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IcePatch2 Compat"
project.ext.description = "File distribution and patching for Ice"
diff --git a/java-compat/src/IceStorm/build.gradle b/java-compat/src/IceStorm/build.gradle
index caa9d50d6bd..67fcb28ae87 100644
--- a/java-compat/src/IceStorm/build.gradle
+++ b/java-compat/src/IceStorm/build.gradle
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
project.ext.displayName = "IceStorm Compat"
project.ext.description = "Publish-subscribe event distribution service"