[java-shib-shared] branch main updated: GEN-269 - Replace code header
Scott Cantor
cantor.2 at osu.edu
Tue Aug 1 14:12:13 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=7007ff0005865a47765600d00da53ee2cf8633ac
The following commit(s) were added to refs/heads/main by this push:
new 7007ff00 GEN-269 - Replace code header
7007ff00 is described below
commit 7007ff0005865a47765600d00da53ee2cf8633ac
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 10:12:09 2023 -0400
GEN-269 - Replace code header
https://shibboleth.atlassian.net/browse/GEN-269
---
resources/checkstyle/checkstyle.xml | 2 +-
.../main/java/net/shibboleth/shared/cli/AbstractCommandLine.java | 9 +++------
.../net/shibboleth/shared/cli/AbstractCommandLineArguments.java | 9 +++------
.../java/net/shibboleth/shared/cli/CommandLineArguments.java | 9 +++------
.../src/main/java/net/shibboleth/shared/cli/package-info.java | 9 +++------
.../httpclient/factory/FileCachingHttpClientFactoryBean.java | 9 +++------
.../shared/spring/httpclient/factory/HttpClientFactoryBean.java | 9 +++------
.../shared/spring/httpclient/factory/HttpHostFactoryBean.java | 9 +++------
.../httpclient/factory/InMemoryCachingHttpClientFactoryBean.java | 9 +++------
.../factory/UsernamePasswoordCredentialsFactoryBean.java | 9 +++------
.../shared/spring/httpclient/factory/package-info.java | 9 +++------
.../spring/httpclient/resource/ConnectionClosingInputStream.java | 9 +++------
.../spring/httpclient/resource/FileBackedHTTPResource.java | 9 +++------
.../shared/spring/httpclient/resource/HTTPResource.java | 9 +++------
.../shared/spring/httpclient/resource/package-info.java | 9 +++------
.../net/shibboleth/shared/spring/servlet/ChainableFilter.java | 9 +++------
.../shared/spring/servlet/RequestURLPrefixPredicate.java | 9 +++------
.../java/net/shibboleth/shared/spring/servlet/URLPrefix.java | 9 +++------
.../shibboleth/shared/spring/servlet/impl/ChainingFilter.java | 9 +++------
.../shared/spring/servlet/impl/CharacterEncodingFilter.java | 9 +++------
.../shared/spring/servlet/impl/CookieBufferingFilter.java | 9 +++------
.../shared/spring/servlet/impl/DelegatingServletProxy.java | 9 +++------
.../shared/spring/servlet/impl/DynamicResponseHeaderFilter.java | 9 +++------
.../shared/spring/servlet/impl/RequestResponseContextFilter.java | 9 +++------
.../shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java | 9 +++------
.../net/shibboleth/shared/spring/servlet/impl/package-info.java | 9 +++------
.../java/net/shibboleth/shared/spring/servlet/package-info.java | 9 +++------
.../spring/httpclient/resource/ConditionalResourceTest.java | 9 +++------
.../spring/httpclient/resource/FileBackedHTTPResourceTest.java | 9 +++------
.../shared/spring/httpclient/resource/HTTPResourceTest.java | 9 +++------
.../shared/spring/httpclient/resource/RepositorySupport.java | 9 +++------
.../shared/spring/httpclient/resource/ResourceTestHelper.java | 9 +++------
.../shared/spring/httpclient/resource/TestHTTPResource.java | 9 +++------
.../servlet/impl/HttpServletRequestResponseContextTest.java | 9 +++------
.../spring/servlet/impl/RequestResponseContextFilterTest.java | 9 +++------
.../spring/servlet/impl/SameSiteCookieHeaderFilterTest.java | 9 +++------
.../net/shibboleth/shared/httpclient/AbstractHttpClient.java | 9 +++------
.../shibboleth/shared/httpclient/ContextHandlingHttpClient.java | 9 +++------
.../shared/httpclient/FileCachingHttpClientBuilder.java | 9 +++------
.../java/net/shibboleth/shared/httpclient/HttpClientBuilder.java | 9 +++------
.../shibboleth/shared/httpclient/HttpClientContextHandler.java | 9 +++------
.../java/net/shibboleth/shared/httpclient/HttpClientSupport.java | 9 +++------
.../shared/httpclient/InMemoryCachingHttpClientBuilder.java | 9 +++------
.../shared/httpclient/LocalAddressProxyRoutePlanner.java | 9 +++------
.../shibboleth/shared/httpclient/LocalAddressRoutePlanner.java | 9 +++------
.../shared/httpclient/LocalAddressSystemRoutePlanner.java | 9 +++------
.../net/shibboleth/shared/httpclient/RequestConnectionClose.java | 9 +++------
.../java/net/shibboleth/shared/httpclient/TLSSocketFactory.java | 9 +++------
.../shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java | 9 +++------
.../main/java/net/shibboleth/shared/httpclient/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/CookieManager.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/IPRange.java | 9 +++------
.../main/java/net/shibboleth/shared/net/MediaTypeSupport.java | 9 +++------
.../java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/URIComparator.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/URIException.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/URISupport.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/URLBuilder.java | 9 +++------
.../java/net/shibboleth/shared/net/impl/BasicURLComparator.java | 9 +++------
.../shared/net/impl/StripMediaTypeParametersFunction.java | 9 +++------
.../main/java/net/shibboleth/shared/net/impl/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/net/package-info.java | 9 +++------
.../net/shibboleth/shared/servlet/AbstractConditionalFilter.java | 9 +++------
.../java/net/shibboleth/shared/servlet/HttpServletSupport.java | 9 +++------
.../shared/servlet/impl/HttpServletRequestResponseContext.java | 9 +++------
.../java/net/shibboleth/shared/servlet/impl/StubbedFilter.java | 9 +++------
.../servlet/impl/ThreadLocalHttpServletRequestSupplier.java | 9 +++------
.../servlet/impl/ThreadLocalHttpServletResponseSupplier.java | 9 +++------
.../java/net/shibboleth/shared/servlet/impl/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/servlet/package-info.java | 9 +++------
.../utilities/java/support/httpclient/HttpClientSupport.java | 9 +++------
.../utilities/java/support/httpclient/package-info.java | 9 +++------
.../utilities/java/support/net/CookieBufferingFilter.java | 9 +++------
.../java/net/shibboleth/utilities/java/support/net/IPRange.java | 9 +++------
.../utilities/java/support/net/RequestResponseContextFilter.java | 9 +++------
.../net/shibboleth/utilities/java/support/net/package-info.java | 9 +++------
.../shared/httpclient/ContextHandlingHttpClientTest.java | 9 +++------
.../shared/httpclient/FileCachingHttpClientBuilderTest.java | 9 +++------
.../net/shibboleth/shared/httpclient/HttpClientBuilderTest.java | 9 +++------
.../net/shibboleth/shared/httpclient/HttpClientSupportTest.java | 9 +++------
.../shared/httpclient/InMemoryCachingHttpClientBuilderTest.java | 9 +++------
.../test/java/net/shibboleth/shared/net/CookieManagerTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/net/IPRangeTest.java | 9 +++------
.../java/net/shibboleth/shared/net/MediaTypeSupportTest.java | 9 +++------
.../net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/net/URISupportTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/net/URLBuilderTest.java | 9 +++------
.../servlet/impl/HttpServletRequestResponseContextTest.java | 9 +++------
.../shibboleth/shared/servlet/impl/HttpServletSupportTest.java | 9 +++------
.../shared/spring/security/factory/KeyStoreFactoryBean.java | 9 +++------
.../spring/security/factory/PKCS11PrivateKeyFactoryBean.java | 9 +++------
.../shared/spring/security/factory/PrivateKeyFactoryBean.java | 9 +++------
.../shared/spring/security/factory/PublicKeyFactoryBean.java | 9 +++------
.../spring/security/factory/X509CertificateChainFactoryBean.java | 9 +++------
.../spring/security/factory/X509CertificateFactoryBean.java | 9 +++------
.../shibboleth/shared/spring/security/factory/package-info.java | 9 +++------
.../spring/security/factory/PrivateKeyFactoryBeanTest.java | 9 +++------
.../shared/spring/security/factory/PublicKeyFactoryBeanTest.java | 9 +++------
.../security/factory/X509CertificateChainFactoryBeanTest.java | 9 +++------
.../spring/security/factory/X509CertificateFactoryBeanTest.java | 9 +++------
.../main/java/net/shibboleth/shared/security/AccessControl.java | 9 +++------
.../net/shibboleth/shared/security/AccessControlService.java | 9 +++------
.../net/shibboleth/shared/security/DataExpiredException.java | 9 +++------
.../src/main/java/net/shibboleth/shared/security/DataSealer.java | 9 +++------
.../java/net/shibboleth/shared/security/DataSealerException.java | 9 +++------
.../net/shibboleth/shared/security/DataSealerKeyStrategy.java | 9 +++------
.../shibboleth/shared/security/IdentifierGenerationStrategy.java | 9 +++------
.../net/shibboleth/shared/security/KeyNotFoundException.java | 9 +++------
.../shared/security/RandomIdentifierParameterSpec.java | 9 +++------
.../shared/security/impl/BasicAccessControlService.java | 9 +++------
.../shared/security/impl/BasicKeystoreKeyStrategy.java | 9 +++------
.../shared/security/impl/BasicKeystoreKeyStrategyTool.java | 9 +++------
.../shibboleth/shared/security/impl/IPRangeAccessControl.java | 9 +++------
.../shared/security/impl/RandomIdentifierGenerationStrategy.java | 9 +++------
.../net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java | 9 +++------
.../security/impl/SecureRandomIdentifierGenerationStrategy.java | 9 +++------
.../shared/security/impl/SelfSignedCertificateGenerator.java | 9 +++------
.../security/impl/Type4UUIDIdentifierGenerationStrategy.java | 9 +++------
.../java/net/shibboleth/shared/security/impl/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/security/package-info.java | 9 +++------
.../test/java/net/shibboleth/shared/security/DataSealerTest.java | 9 +++------
.../net/shibboleth/shared/security/TestResourceConverter.java | 9 +++------
.../shared/security/impl/BasicKeystoreKeyStrategyTest.java | 9 +++------
.../security/impl/RandomIdentifierGenerationStrategyTest.java | 9 +++------
.../shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java | 9 +++------
.../impl/SecureRandomIdentifierGenerationStrategyTest.java | 9 +++------
.../security/impl/Type4UUIDIdentifierGenerationStrategyTest.java | 9 +++------
.../net/shibboleth/shared/service/AbstractReloadableService.java | 9 +++------
.../main/java/net/shibboleth/shared/service/LoggingService.java | 9 +++------
.../java/net/shibboleth/shared/service/ReloadableService.java | 9 +++------
.../net/shibboleth/shared/service/ReloadableServiceGaugeSet.java | 9 +++------
.../java/net/shibboleth/shared/service/ServiceException.java | 9 +++------
.../java/net/shibboleth/shared/service/ServiceableComponent.java | 9 +++------
.../shibboleth/shared/service/impl/LogbackLoggingService.java | 9 +++------
.../java/net/shibboleth/shared/service/impl/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/service/package-info.java | 9 +++------
.../shared/service/reloadable/NonReloadableExcluder.java | 9 +++------
.../shibboleth/shared/service/reloadable/ProxiedFactoryBean.java | 9 +++------
.../shibboleth/shared/service/reloadable/ReloadableScope.java | 9 +++------
.../net/shibboleth/shared/service/reloadable/package-info.java | 9 +++------
.../service/security/impl/DelegatingAccessControlService.java | 9 +++------
.../service/security/impl/ReloadingAccessControlService.java | 9 +++------
.../service/security/impl/ServiceableAccessControlService.java | 9 +++------
.../shibboleth/shared/service/security/impl/package-info.java | 9 +++------
.../shared/spring/service/AbstractServiceableComponent.java | 9 +++------
.../shared/spring/service/ApplicationContextServiceStrategy.java | 9 +++------
.../spring/service/ApplicationContextServiceableComponent.java | 9 +++------
.../shared/spring/service/ClassBasedServiceStrategy.java | 9 +++------
.../shared/spring/service/ReloadableSpringService.java | 9 +++------
.../shared/spring/service/impl/SpringServiceableComponent.java | 9 +++------
.../net/shibboleth/shared/spring/service/impl/package-info.java | 9 +++------
.../java/net/shibboleth/shared/spring/service/package-info.java | 9 +++------
.../shibboleth/shared/spring/service/NonReloadableTestBean.java | 9 +++------
.../shared/spring/service/ReloadableBeanServiceTest.java | 9 +++------
.../shared/spring/service/ReloadableSpringServiceTest.java | 9 +++------
.../net/shibboleth/shared/spring/service/ReloadableTestBean.java | 9 +++------
.../shared/spring/service/TestServiceableComponent.java | 9 +++------
.../ext/spring/config/IdentifiableBeanPostProcessor.java | 9 +++------
.../main/java/net/shibboleth/ext/spring/config/package-info.java | 9 +++------
.../ext/spring/context/DelimiterAwareApplicationContext.java | 9 +++------
.../java/net/shibboleth/ext/spring/context/package-info.java | 9 +++------
.../shared/spring/config/BooleanToPredicateConverter.java | 9 +++------
.../shibboleth/shared/spring/config/DeprecatedBeanDetector.java | 9 +++------
.../shibboleth/shared/spring/config/DurationPropertyEditor.java | 9 +++------
.../shared/spring/config/IdentifiableBeanPostProcessor.java | 9 +++------
.../shared/spring/config/IdentifiedComponentManager.java | 9 +++------
.../shared/spring/config/RelocatedBeanFactoryPostProcessor.java | 9 +++------
.../shared/spring/config/StringBooleanToPredicateConverter.java | 9 +++------
.../shared/spring/config/StringToDurationConverter.java | 9 +++------
.../shared/spring/config/StringToIPRangeConverter.java | 9 +++------
.../shibboleth/shared/spring/config/StringToPeriodConverter.java | 9 +++------
.../shared/spring/config/StringToResourceConverter.java | 9 +++------
.../java/net/shibboleth/shared/spring/config/package-info.java | 9 +++------
.../context/AbstractPropertiesApplicationContextInitializer.java | 9 +++------
.../DeferPlaceholderFileSystemXmlWebApplicationContext.java | 9 +++------
.../shared/spring/context/DelimiterAwareApplicationContext.java | 9 +++------
.../spring/context/FileSystemXmlWebApplicationContext.java | 9 +++------
.../spring/context/FilesystemGenericApplicationContext.java | 9 +++------
.../spring/context/FilesystemGenericWebApplicationContext.java | 9 +++------
.../java/net/shibboleth/shared/spring/context/package-info.java | 9 +++------
.../shared/spring/custom/AbstractCustomBeanDefinitionParser.java | 9 +++------
.../shared/spring/custom/BaseSpringNamespaceHandler.java | 9 +++------
.../shared/spring/custom/EmbeddedAndSchemaAwareReader.java | 9 +++------
.../shared/spring/custom/LocalOnlyResourceEntityResolver.java | 9 +++------
.../custom/SchemaTypeAwareBeanDefinitionDocumentReader.java | 9 +++------
.../custom/SchemaTypeAwareBeanDefinitionParserDelegate.java | 9 +++------
.../spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java | 9 +++------
.../shared/spring/custom/SecondaryNamespaceHandler.java | 9 +++------
.../java/net/shibboleth/shared/spring/custom/package-info.java | 9 +++------
.../shibboleth/shared/spring/error/ErrorRaisingController.java | 9 +++------
.../shared/spring/error/ExtendedMappingExceptionResolver.java | 9 +++------
.../java/net/shibboleth/shared/spring/error/package-info.java | 9 +++------
.../spring/expression/AbstractSpringExpressionEvaluator.java | 9 +++------
.../shared/spring/expression/SpringExpressionBiConsumer.java | 9 +++------
.../shared/spring/expression/SpringExpressionBiFunction.java | 9 +++------
.../shared/spring/expression/SpringExpressionBiPredicate.java | 9 +++------
.../shared/spring/expression/SpringExpressionConsumer.java | 9 +++------
.../shared/spring/expression/SpringExpressionFunction.java | 9 +++------
.../shared/spring/expression/SpringExpressionPredicate.java | 9 +++------
.../net/shibboleth/shared/spring/expression/package-info.java | 9 +++------
.../shared/spring/factory/AbstractComponentAwareFactoryBean.java | 9 +++------
.../shared/spring/factory/CombiningListFactoryBean.java | 9 +++------
.../shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java | 9 +++------
.../shared/spring/factory/EvaluableScriptFactoryBean.java | 9 +++------
.../net/shibboleth/shared/spring/factory/PatternFactoryBean.java | 9 +++------
.../java/net/shibboleth/shared/spring/factory/package-info.java | 9 +++------
.../shibboleth/shared/spring/resource/ConditionalResource.java | 9 +++------
.../shared/spring/resource/ConditionalResourceResolver.java | 9 +++------
.../shared/spring/resource/PreferFileSystemResourceLoader.java | 9 +++------
.../net/shibboleth/shared/spring/resource/ResourceHelper.java | 9 +++------
.../shared/spring/resource/RunnableFileSystemResource.java | 9 +++------
.../java/net/shibboleth/shared/spring/resource/package-info.java | 9 +++------
.../shared/spring/util/AnnotationParameterNameDiscoverer.java | 9 +++------
.../shibboleth/shared/spring/util/ApplicationContextBuilder.java | 9 +++------
.../java/net/shibboleth/shared/spring/util/SpringSupport.java | 9 +++------
.../java/net/shibboleth/shared/spring/util/package-info.java | 9 +++------
.../shared/spring/config/IdentifiableBeanPostProcessorTest.java | 9 +++------
.../shared/spring/config/IdentifiedComponentManagerTest.java | 9 +++------
.../spring/config/RelocatedBeanFactoryPostProcessorTest.java | 9 +++------
.../spring/config/StringBooleanToPredicateConverterTest.java | 9 +++------
.../shibboleth/shared/spring/config/StringToResourceTest.java | 9 +++------
.../java/net/shibboleth/shared/spring/custom/CanaryParser.java | 9 +++------
.../net/shibboleth/shared/spring/custom/CanarySchemaTest.java | 9 +++------
.../net/shibboleth/shared/spring/custom/LowerParsersAndBean.java | 9 +++------
.../net/shibboleth/shared/spring/custom/NestedParsersTest.java | 9 +++------
.../net/shibboleth/shared/spring/custom/UpperParserAndBean.java | 9 +++------
.../shared/spring/expression/SpringExpressionTest.java | 9 +++------
.../shared/spring/factory/CombiningListFactoryBeanTest.java | 9 +++------
.../shared/spring/factory/DOMDocumentFactoryBeanTest.java | 9 +++------
.../net/shibboleth/shared/spring/factory/ResourceListBean.java | 9 +++------
.../test/java/net/shibboleth/shared/spring/resource/Idp1326.java | 9 +++------
.../shibboleth/shared/spring/resource/RunnableResourceTest.java | 9 +++------
.../test/java/net/shibboleth/shared/spring/util/ParamClass.java | 9 +++------
.../shared/spring/util/ParameterNameAnnotationTest.java | 9 +++------
.../net/shibboleth/shared/annotation/ConfigurationSetting.java | 9 +++------
.../java/net/shibboleth/shared/annotation/ParameterName.java | 9 +++------
.../main/java/net/shibboleth/shared/annotation/Prototype.java | 9 +++------
.../java/net/shibboleth/shared/annotation/constraint/Live.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/Negative.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/NonNegative.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/NonPositive.java | 9 +++------
.../shared/annotation/constraint/NonnullAfterInit.java | 9 +++------
.../shared/annotation/constraint/NonnullBeforeExec.java | 9 +++------
.../shared/annotation/constraint/NonnullBeforeTest.java | 9 +++------
.../shibboleth/shared/annotation/constraint/NonnullElements.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/NotEmpty.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/NotLive.java | 9 +++------
.../shared/annotation/constraint/NullableElements.java | 9 +++------
.../net/shibboleth/shared/annotation/constraint/Positive.java | 9 +++------
.../shared/annotation/constraint/ThreadSafeAfterInit.java | 9 +++------
.../shibboleth/shared/annotation/constraint/Unmodifiable.java | 9 +++------
.../shibboleth/shared/annotation/constraint/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/annotation/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/codec/Base32Support.java | 9 +++------
.../src/main/java/net/shibboleth/shared/codec/Base64Support.java | 9 +++------
.../main/java/net/shibboleth/shared/codec/CodecException.java | 9 +++------
.../main/java/net/shibboleth/shared/codec/DecodingException.java | 9 +++------
.../main/java/net/shibboleth/shared/codec/EncodingException.java | 9 +++------
.../src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java | 9 +++------
.../main/java/net/shibboleth/shared/codec/StringDigester.java | 9 +++------
.../src/main/java/net/shibboleth/shared/codec/package-info.java | 9 +++------
.../java/net/shibboleth/shared/collection/ClassIndexedSet.java | 9 +++------
.../shibboleth/shared/collection/ClassToInstanceMultiMap.java | 9 +++------
.../java/net/shibboleth/shared/collection/CollectionSupport.java | 9 +++------
.../net/shibboleth/shared/collection/IndexingObjectStore.java | 9 +++------
.../src/main/java/net/shibboleth/shared/collection/LazyList.java | 9 +++------
.../src/main/java/net/shibboleth/shared/collection/LazyMap.java | 9 +++------
.../src/main/java/net/shibboleth/shared/collection/LazySet.java | 9 +++------
.../shared/collection/LockableClassToInstanceMultiMap.java | 9 +++------
.../src/main/java/net/shibboleth/shared/collection/Pair.java | 9 +++------
.../net/shibboleth/shared/collection/ReflectionSafeIterator.java | 9 +++------
.../net/shibboleth/shared/collection/ValueTypeIndexedMap.java | 9 +++------
.../main/java/net/shibboleth/shared/collection/package-info.java | 9 +++------
.../component/AbstractIdentifiableInitializableComponent.java | 9 +++------
.../component/AbstractIdentifiedInitializableComponent.java | 9 +++------
.../shared/component/AbstractInitializableComponent.java | 9 +++------
.../src/main/java/net/shibboleth/shared/component/Component.java | 9 +++------
.../shared/component/ComponentInitializationException.java | 9 +++------
.../java/net/shibboleth/shared/component/ComponentSupport.java | 9 +++------
.../shibboleth/shared/component/DestroyedComponentException.java | 9 +++------
.../net/shibboleth/shared/component/DestructableComponent.java | 9 +++------
.../net/shibboleth/shared/component/IdentifiableComponent.java | 9 +++------
.../net/shibboleth/shared/component/IdentifiedComponent.java | 9 +++------
.../net/shibboleth/shared/component/InitializableComponent.java | 9 +++------
.../shared/component/UninitializedComponentException.java | 9 +++------
.../net/shibboleth/shared/component/UnmodifiableComponent.java | 9 +++------
.../shared/component/UnmodifiableComponentException.java | 9 +++------
.../main/java/net/shibboleth/shared/component/package-info.java | 9 +++------
.../net/shibboleth/shared/logic/AbstractTriStatePredicate.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/AllMatchPredicate.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/BiFunctionSupport.java | 9 +++------
.../java/net/shibboleth/shared/logic/BiPredicateSupport.java | 9 +++------
.../shared/logic/CaseInsensitiveStringMatchPredicate.java | 9 +++------
.../src/main/java/net/shibboleth/shared/logic/Constraint.java | 9 +++------
.../shibboleth/shared/logic/ConstraintViolationException.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/FunctionSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/NonnullFunction.java | 9 +++------
.../net/shibboleth/shared/logic/PredicateDrivenFunction.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/PredicateSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/RegexPredicate.java | 9 +++------
.../java/net/shibboleth/shared/logic/ScriptedBiConsumer.java | 9 +++------
.../java/net/shibboleth/shared/logic/ScriptedBiFunction.java | 9 +++------
.../java/net/shibboleth/shared/logic/ScriptedBiPredicate.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/ScriptedConsumer.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/ScriptedFunction.java | 9 +++------
.../main/java/net/shibboleth/shared/logic/ScriptedPredicate.java | 9 +++------
.../net/shibboleth/shared/logic/StrategyIndirectedPredicate.java | 9 +++------
.../net/shibboleth/shared/logic/TransformAndCheckFunction.java | 9 +++------
.../net/shibboleth/shared/logic/TrimOrNullStringFunction.java | 9 +++------
.../src/main/java/net/shibboleth/shared/logic/package-info.java | 9 +++------
.../java/net/shibboleth/shared/primitive/CleanerSupport.java | 9 +++------
.../java/net/shibboleth/shared/primitive/DeprecationSupport.java | 9 +++------
.../java/net/shibboleth/shared/primitive/LangBearingString.java | 9 +++------
.../main/java/net/shibboleth/shared/primitive/LoggerFactory.java | 9 +++------
.../java/net/shibboleth/shared/primitive/NonnullSupplier.java | 9 +++------
.../main/java/net/shibboleth/shared/primitive/ObjectSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/primitive/StringSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/primitive/TimerSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/primitive/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/resolver/ClassCriterion.java | 9 +++------
.../main/java/net/shibboleth/shared/resolver/CriteriaSet.java | 9 +++------
.../src/main/java/net/shibboleth/shared/resolver/Criterion.java | 9 +++------
.../shibboleth/shared/resolver/CriterionPredicateRegistry.java | 9 +++------
.../src/main/java/net/shibboleth/shared/resolver/Resolver.java | 9 +++------
.../java/net/shibboleth/shared/resolver/ResolverException.java | 9 +++------
.../java/net/shibboleth/shared/resolver/ResolverSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/resolver/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/resource/Resource.java | 9 +++------
.../main/java/net/shibboleth/shared/resource/package-info.java | 9 +++------
.../net/shibboleth/shared/scripting/AbstractScriptEvaluator.java | 9 +++------
.../java/net/shibboleth/shared/scripting/EvaluableScript.java | 9 +++------
.../net/shibboleth/shared/scripting/ScriptContextExtender.java | 9 +++------
.../java/net/shibboleth/shared/scripting/ScriptedRunnable.java | 9 +++------
.../main/java/net/shibboleth/shared/scripting/package-info.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/AttributeSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/ClasspathResolver.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/ElementSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/NamespaceSupport.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/ParserPool.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/QNameSupport.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/SerializeSupport.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/XMLConstants.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/XMLParserException.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/XMLSpace.java | 9 +++------
.../java/net/shibboleth/shared/xml/impl/BasicParserPool.java | 9 +++------
.../java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java | 9 +++------
.../net/shibboleth/shared/xml/impl/ThrowingEntityResolver.java | 9 +++------
.../main/java/net/shibboleth/shared/xml/impl/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/xml/package-info.java | 9 +++------
.../shibboleth/utilities/java/support/codec/Base32Support.java | 9 +++------
.../shibboleth/utilities/java/support/codec/Base64Support.java | 9 +++------
.../net/shibboleth/utilities/java/support/codec/HTMLEncoder.java | 9 +++------
.../shibboleth/utilities/java/support/codec/StringDigester.java | 9 +++------
.../shibboleth/utilities/java/support/codec/package-info.java | 9 +++------
.../shibboleth/utilities/java/support/logic/FunctionSupport.java | 9 +++------
.../utilities/java/support/logic/PredicateSupport.java | 9 +++------
.../shibboleth/utilities/java/support/logic/package-info.java | 9 +++------
.../utilities/java/support/primitive/StringSupport.java | 9 +++------
.../utilities/java/support/primitive/package-info.java | 9 +++------
.../test/java/net/shibboleth/shared/codec/Base32SupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/codec/Base64SupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java | 9 +++------
.../java/net/shibboleth/shared/codec/StringDigesterTest.java | 9 +++------
.../net/shibboleth/shared/collection/ClassIndexedSetTest.java | 9 +++------
.../shared/collection/ClassToInstanceMultiMapTest.java | 9 +++------
.../java/net/shibboleth/shared/collection/CollectionTest.java | 9 +++------
.../shibboleth/shared/collection/IndexingObjectStoreTest.java | 9 +++------
.../test/java/net/shibboleth/shared/collection/LazyListTest.java | 9 +++------
.../test/java/net/shibboleth/shared/collection/LazyMapTest.java | 9 +++------
.../test/java/net/shibboleth/shared/collection/LazySetTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/collection/ListTest.java | 9 +++------
.../shared/collection/LockableClassToInstanceMultiMapTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/collection/MapTest.java | 9 +++------
.../src/test/java/net/shibboleth/shared/collection/PairTest.java | 9 +++------
.../shibboleth/shared/collection/ValueTypeIndexedMapTest.java | 9 +++------
.../component/AbstractIdentifiedInitializableComponentTest.java | 9 +++------
.../shared/component/AbstractInitializableComponentTest.java | 9 +++------
.../net/shibboleth/shared/component/ComponentSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/logic/AllMatchPredicateTest.java | 9 +++------
.../java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java | 9 +++------
.../shared/logic/CaseInsensitiveStringMatchPredicateTest.java | 9 +++------
.../shared/logic/ComponentInitializationExceptionFunction.java | 9 +++------
.../shared/logic/ComponentInitializationExceptionPredicate.java | 9 +++------
.../test/java/net/shibboleth/shared/logic/ExceptionFunction.java | 9 +++------
.../java/net/shibboleth/shared/logic/ExceptionPredicate.java | 9 +++------
.../src/test/java/net/shibboleth/shared/logic/ScriptedTest.java | 9 +++------
.../shibboleth/shared/logic/TransformAndCheckFunctionTest.java | 9 +++------
.../shibboleth/shared/logic/TrimOrNullStringFunctionTest.java | 9 +++------
.../java/net/shibboleth/shared/primitive/ObjectSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/primitive/StringSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/primitive/TimerSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/resolver/CriteriaSetTest.java | 9 +++------
.../shared/resolver/CriterionPredicateRegistryTest.java | 9 +++------
.../net/shibboleth/shared/resolver/EvaluableFooCriterion.java | 9 +++------
.../shibboleth/shared/resolver/EvaluableTestFooCriterion.java | 9 +++------
.../src/test/java/net/shibboleth/shared/resolver/Foo.java | 9 +++------
.../test/java/net/shibboleth/shared/resolver/FooPredicate.java | 9 +++------
.../java/net/shibboleth/shared/resolver/ResolverSupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/resolver/TestCriterion.java | 9 +++------
.../net/shibboleth/shared/scripting/AbstractScriptEngine.java | 9 +++------
.../net/shibboleth/shared/scripting/EvaluableScriptTest.java | 9 +++------
.../shibboleth/shared/scripting/RuntimeScriptingException.java | 9 +++------
.../java/net/shibboleth/shared/xml/AttributeSupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/xml/DOMTypeSupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/xml/ElementSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/xml/NamespaceSupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/xml/QNameSupportTest.java | 9 +++------
.../test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java | 9 +++------
.../java/net/shibboleth/shared/xml/SerializeSupportTest.java | 9 +++------
.../java/net/shibboleth/shared/xml/TestResourceConverter.java | 9 +++------
.../src/test/java/net/shibboleth/shared/xml/XMLSpaceTest.java | 9 +++------
.../java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java | 9 +++------
.../test/java/net/shibboleth/shared/xml/impl/WellFormedTest.java | 9 +++------
.../java/net/shibboleth/shared/testing/ConstantSupplier.java | 9 +++------
.../net/shibboleth/shared/testing/DatabaseTestingSupport.java | 9 +++------
.../java/net/shibboleth/shared/testing/InMemoryDirectory.java | 9 +++------
.../net/shibboleth/shared/testing/MockApplicationContext.java | 9 +++------
.../net/shibboleth/shared/testing/MockReloadableService.java | 9 +++------
.../java/net/shibboleth/shared/testing/RepositorySupport.java | 9 +++------
.../java/net/shibboleth/shared/testing/ResourceTestHelper.java | 9 +++------
.../net/shibboleth/shared/testing/ShowAutomaticModuleNames.java | 9 +++------
.../src/main/java/net/shibboleth/shared/testing/TestSupport.java | 9 +++------
.../main/java/net/shibboleth/shared/testing/VelocityEngine.java | 9 +++------
.../main/java/net/shibboleth/shared/testing/package-info.java | 9 +++------
.../shibboleth/shared/spring/velocity/SpringResourceLoader.java | 9 +++------
.../net/shibboleth/shared/spring/velocity/VelocityConfig.java | 9 +++------
.../shibboleth/shared/spring/velocity/VelocityConfigurer.java | 9 +++------
.../shibboleth/shared/spring/velocity/VelocityEngineFactory.java | 9 +++------
.../shared/spring/velocity/VelocityEngineFactoryBean.java | 9 +++------
.../java/net/shibboleth/shared/spring/velocity/VelocityView.java | 9 +++------
.../shibboleth/shared/spring/velocity/VelocityViewResolver.java | 9 +++------
.../java/net/shibboleth/shared/spring/velocity/package-info.java | 9 +++------
.../src/main/java/net/shibboleth/shared/velocity/Template.java | 9 +++------
.../main/java/net/shibboleth/shared/velocity/package-info.java | 9 +++------
437 files changed, 1309 insertions(+), 2617 deletions(-)
diff --git a/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
index 68c57c0c..f456c139 100644
--- a/resources/checkstyle/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -113,7 +113,7 @@
<property name="max" value="1000"/>
</module>
<module name="Header">
- <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development,\n * Inc. (UCAID) under one or more contributor license agreements. See the\n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache\n * License, Version 2.0 (the "License"); you may not use this file except in\n * compliance with the License. You may obtain a cop [...]
+ <property name="header" value="/*\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, eit [...]
</module>
<module name="JavadocPackage"/>
<module name="LineLength">
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
index d904b755..ff41396b 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
index 67aac136..27b3baf4 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
index 09a0fa21..3569c44a 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/package-info.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/package-info.java
index a0529283..17dfef56 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/package-info.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
index 4e10713e..99dad8ed 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
index ca16c281..28e939a8 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpHostFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpHostFactoryBean.java
index f0c4959c..4d1c6de5 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpHostFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpHostFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
index 2dda68c5..29ccd8f9 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/UsernamePasswoordCredentialsFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/UsernamePasswoordCredentialsFactoryBean.java
index 51354ac1..83f50ecc 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/UsernamePasswoordCredentialsFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/UsernamePasswoordCredentialsFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/package-info.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/package-info.java
index 7707178a..c43e723a 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/package-info.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/ConnectionClosingInputStream.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/ConnectionClosingInputStream.java
index 1fb27406..b54ae28a 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/ConnectionClosingInputStream.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/ConnectionClosingInputStream.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
index 91089188..f8271e5b 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
index d7a836e2..35c19f12 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/package-info.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/package-info.java
index 45f0271b..ff49df16 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/package-info.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/ChainableFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/ChainableFilter.java
index 702b552a..220cd685 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/ChainableFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/ChainableFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/RequestURLPrefixPredicate.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/RequestURLPrefixPredicate.java
index 8747b69d..3081cd17 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/RequestURLPrefixPredicate.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/RequestURLPrefixPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/URLPrefix.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/URLPrefix.java
index 9d835d69..8d9ac2fa 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/URLPrefix.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/URLPrefix.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/ChainingFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/ChainingFilter.java
index 7b1a118b..471c01f9 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/ChainingFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/ChainingFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
index 8ec9b94e..86eb11b8 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CookieBufferingFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CookieBufferingFilter.java
index 17f10023..aac9c016 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CookieBufferingFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CookieBufferingFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DelegatingServletProxy.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DelegatingServletProxy.java
index d472c7f1..c974d960 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DelegatingServletProxy.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DelegatingServletProxy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DynamicResponseHeaderFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DynamicResponseHeaderFilter.java
index 66147c08..b2733a56 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DynamicResponseHeaderFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/DynamicResponseHeaderFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilter.java
index 5bfa8a40..a19d0bde 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
index 0c35ade8..d6659f10 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/package-info.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/package-info.java
index ad7ad158..19482ddc 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/package-info.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/package-info.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/package-info.java
index d0a85672..341907b6 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/package-info.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index ac696387..1108f151 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
index 61df4f04..e8d378fa 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
index 11f2060c..e370e1dc 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
index 47a35117..82f0ff7f 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ResourceTestHelper.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ResourceTestHelper.java
index 73c889c0..4b411543 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ResourceTestHelper.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ResourceTestHelper.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/TestHTTPResource.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/TestHTTPResource.java
index 04a17a58..03f42deb 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/TestHTTPResource.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/TestHTTPResource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/HttpServletRequestResponseContextTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/HttpServletRequestResponseContextTest.java
index 4285a67a..d7c4fe3d 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/HttpServletRequestResponseContextTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/HttpServletRequestResponseContextTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilterTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilterTest.java
index b5d8575d..e91b9e94 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilterTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/RequestResponseContextFilterTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilterTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilterTest.java
index 8c89cf14..f249fc32 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilterTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilterTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/AbstractHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/AbstractHttpClient.java
index 0a61e59d..94b56695 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/AbstractHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/AbstractHttpClient.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
index 74a95e2c..8d461b5f 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index 29c90b00..db3c9485 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
index f3acda89..88eca34c 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
index eb069719..7b5e11be 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
index 711f20d1..3660573a 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
index 3535fe66..2afbb163 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressProxyRoutePlanner.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressProxyRoutePlanner.java
index 2dc3eeb0..487596e9 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressProxyRoutePlanner.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressProxyRoutePlanner.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressRoutePlanner.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressRoutePlanner.java
index 02c4f504..80212221 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressRoutePlanner.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressRoutePlanner.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressSystemRoutePlanner.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressSystemRoutePlanner.java
index a6599ea8..b061e8d4 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressSystemRoutePlanner.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/LocalAddressSystemRoutePlanner.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
index 32917b13..cd4e9340 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
index 86a23741..3366d5d3 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
index 2b2226d5..11a68cb2 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
index 50eccc87..00b211c0 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
index 7b16831f..c92ccc25 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
index b3eb97cc..a472c66f 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
index 0e3414e1..411f0cad 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
index 75b002ca..82e9ec17 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
index d2300789..486e98b9 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
index 9793b171..fe562598 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
index 7ee04319..99389832 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
index f2dd8357..cd46a75e 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
index 4449ae26..f2ddb6fe 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
index c8d2e1b2..b4bababc 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/package-info.java
index ef2843ca..48abd197 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
index 54f8533b..39c0bbac 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/AbstractConditionalFilter.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/AbstractConditionalFilter.java
index d7e988c9..33a785d7 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/AbstractConditionalFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/AbstractConditionalFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
index 1dfa8bf7..5836d59c 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContext.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContext.java
index 409825bb..2b15f9a3 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContext.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/StubbedFilter.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/StubbedFilter.java
index e0c86a67..ae8e1d4f 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/StubbedFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/StubbedFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletRequestSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletRequestSupplier.java
index bff45eb9..a006abcf 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletRequestSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletRequestSupplier.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletResponseSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletResponseSupplier.java
index 2b39b868..f55639a4 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletResponseSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/ThreadLocalHttpServletResponseSupplier.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/package-info.java
index 52a236ee..2cc0ae1d 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/package-info.java
index 83c713d9..6c0bf52d 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
index 13082047..6f95e4c2 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
index da7ce357..310f8406 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
index 1b81e380..352d2e32 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
index a59c8094..74271cd5 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
index dc6f67dd..1217e9a3 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
index 4fe250e0..cbc999c7 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
index 3bc7ccf5..92459028 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
index a6d1c115..0860137e 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
index 17b64a34..ee29ec1f 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
index 031551c2..aaedd20b 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
index 0ce59664..0dd51d11 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
index 73e814eb..28bae324 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
index a314941c..dbccf0f7 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java
index 5961698c..84180844 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java
index e819a7c0..34c8ebad 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
index a60578d0..2665829f 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
index 4dc6ee33..2fff9c8b 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContextTest.java b/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContextTest.java
index 83d3f42f..0035ddcf 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContextTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletRequestResponseContextTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletSupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletSupportTest.java
index 97b04631..26035586 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/servlet/impl/HttpServletSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
index 5db7ed15..ebd6f21f 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
index 0b2036cc..bb939029 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PKCS11PrivateKeyFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
index 217eb899..12cf8ce9 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
index 75dcb5e3..8b450f26 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
index cd057b1e..7baa7c28 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
index 11c80f29..f5c027f4 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
index 5388c759..c9fb6668 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
index 229d84fb..166a7b2c 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
index 7938d83b..d9313015 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
index 8fdd9be4..733ccdd5 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
index 200cd2cc..ca3da688 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
index 12739c86..ae32e205 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
index 648187c5..1dcfc55d 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
index 0ad545d8..e3cc9754 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index 69fde0e4..0d6cbade 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
index 095247f3..011dd721 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
index d7522d72..a3e66546 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
index 061ad47d..2c0d76bb 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java b/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
index 1861c9cc..0b107bde 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/RandomIdentifierParameterSpec.java b/shib-security/src/main/java/net/shibboleth/shared/security/RandomIdentifierParameterSpec.java
index 29147a93..5c3d7163 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/RandomIdentifierParameterSpec.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/RandomIdentifierParameterSpec.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
index 982effe4..a38b2c32 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index d0df1fa2..9adfb02e 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
index 4baafa78..84f3d5e2 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
index 81a146a9..8bae9a27 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
index d57095b0..6e272a87 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index f8d7625c..127dbfc7 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
index d74619c8..9c84d5de 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
index b7b188c9..c6fb1651 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
index fa94756b..11bd92f7 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
index 8b670b88..778b6613 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java b/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
index 114db03c..ba51b45b 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
index f4edba97..daf86810 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
index 32df4949..1249b700 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
index 1c2cc13d..d7d86b83 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
index 8264d995..8b687053 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
index 3c526e7a..19eeb9b6 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
index 9b0186e1..25fce4b6 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
index 49094af1..6ad1f273 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
index 6b6c0688..d4c3ac37 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java b/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
index d98c0d2a..ebdf29aa 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/LoggingService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
index 4e6df708..9e623197 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
index 738e6bb5..719b34d4 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
index 6dd22ea7..79a44920 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
index b9262e75..8bdeff55 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ServiceableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
index e033c516..34266557 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/impl/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/service/impl/package-info.java
index bac5fe75..19022ee4 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/impl/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/service/package-info.java
index 90acc040..3e59df10 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/NonReloadableExcluder.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/NonReloadableExcluder.java
index a9b414fc..b0df964d 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/NonReloadableExcluder.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/NonReloadableExcluder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
index 28f90fa8..e4ac04bf 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
index a5c51e96..e9c63c90 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/package-info.java
index f96ec883..af8d2cfb 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
index bb08ba05..7957dec4 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
index 246ad26d..01fff4bb 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
index 2c7c1553..f97cfa4e 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/package-info.java
index 1a8b9c14..9ce9aa81 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
index eddffafc..68ad231c 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/AbstractServiceableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
index 276d2d00..2c4adaa4 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
index b312bbe0..ef4e8b3f 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
index a8d8f81c..e61cb76c 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
index b6431f21..536dd7ca 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/SpringServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/SpringServiceableComponent.java
index b6188de4..839e9911 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/SpringServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/SpringServiceableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/package-info.java
index 9eacea2d..51bf9d7d 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
index bdc1b4f7..ae949012 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
index cc222d16..4b4ad70c 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
index 2d7d7671..e8bd9bf9 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
index 658ced21..e07fb8db 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
index 257b58d3..6c016eba 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
index bae3a936..44f1c12b 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
index cb342e94..cf44da61 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/config/package-info.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/config/package-info.java
index e9b60c1d..982746fe 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/config/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/config/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
index deb69c0d..e817b675 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/package-info.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/package-info.java
index 522509bc..3abeafe6 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
index 385322d1..d476a714 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
index bd27e5d1..7db1031e 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DurationPropertyEditor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DurationPropertyEditor.java
index a9ee485f..0eb1ecfc 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DurationPropertyEditor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DurationPropertyEditor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
index c607767b..7bd00599 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
index c9827a81..ad97dd20 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
index 8c40f193..1a1ec28b 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverter.java
index 128281d6..2322d308 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
index 9f77dc2b..a76c0576 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
index a711c36b..304e08f7 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
index e6be37f9..0a8015d2 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
index 69373869..e8f1eb76 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/package-info.java
index 366568b7..c37399f6 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
index 3bff0d89..bf00b551 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
index 9f72031a..dd6f1b56 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
index e7f41e38..8d21584f 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/DelimiterAwareApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
index 1745d9a8..c6a8b890 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
index 31b706b3..88d8d93f 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
index fde8d9ff..e64f3459 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FilesystemGenericWebApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/package-info.java
index cbb4797f..86b6db4f 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
index 0ed25506..538c5e3a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/AbstractCustomBeanDefinitionParser.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
index b2d51c65..51017cf6 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
index dbfcdc33..c867bbad 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/EmbeddedAndSchemaAwareReader.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/LocalOnlyResourceEntityResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/LocalOnlyResourceEntityResolver.java
index ce4f8e11..6a3e006d 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/LocalOnlyResourceEntityResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/LocalOnlyResourceEntityResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
index 05f005bb..b3a176c3 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionDocumentReader.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
index 0d92c8d3..84cfda25 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareBeanDefinitionParserDelegate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
index ff96048f..555873af 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SchemaTypeAwareXMLBeanDefinitionReader.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
index c5566e6e..4570d249 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java
index cdc1e8da..edbe6a0e 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ErrorRaisingController.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ErrorRaisingController.java
index 3ea4f679..15039880 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ErrorRaisingController.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ErrorRaisingController.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
index d63ce230..9af4b545 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/package-info.java
index 80b994c6..b61fc7ec 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
index fa660209..45c6751e 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
index 3c24cc29..ec7b860a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
index bc4b0c33..8710c275 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
index 696dfb98..a47d3582 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
index 999467f0..eb9d2e00 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
index 1f1f6020..fcac4862 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
index 1a55f3cc..adb5f6b3 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java
index 3641f345..6132bc02 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
index 724315be..47c6ffe4 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
index 45fe40f6..f43cb759 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
index c6ee8b59..0646368a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
index befb6bd2..7529ac58 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
index 3ec495fa..7ab973b7 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
index 59f45480..3179705c 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
index 83cd5bd6..943d3e33 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
index b0d72e0b..7b009138 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
index d41c469f..b163ca5e 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
index 74bf58aa..0b9c32ce 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
index bd0b4557..91671b93 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
index 507525c2..b716e602 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
index a2d03b42..db8c0c41 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
index e5cf5b33..fd203b7a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
index 688adf37..94bacae1 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
index b1604fe5..2d15617c 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
index 15063b24..e9c6ba12 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiableBeanPostProcessorTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
index 601bf40a..aa240308 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
index 91e25dcb..2c71f475 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessorTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverterTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverterTest.java
index 44f6d054..06117b51 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverterTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringBooleanToPredicateConverterTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
index f05344dc..bbaad061 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/StringToResourceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanaryParser.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanaryParser.java
index 677f978a..d1bd6509 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanaryParser.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanaryParser.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanarySchemaTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanarySchemaTest.java
index 91348f2d..64bc917c 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanarySchemaTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/CanarySchemaTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
index 5eb94e24..06ded70f 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
index 07bb2610..d6d7af17 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/NestedParsersTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
index d4a25caa..1fa5dab4 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/UpperParserAndBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
index 210b9f5c..8bcddc9e 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
index cccc163c..5d10cf67 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
index 296945b5..379357a4 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
index bd795df9..d8dd65e6 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
index 82854dd0..eef28cdd 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
index b35ca61e..1144c29c 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
index e363893a..4418654d 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
index 048ea329..559c24ef 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParameterNameAnnotationTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/ConfigurationSetting.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/ConfigurationSetting.java
index 84a740a7..e6ddd658 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/ConfigurationSetting.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/ConfigurationSetting.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
index f9a3d97b..77e5a3ef 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
index f48f14f4..381a856c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
index 7abe96a6..ecc1b697 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
index e4ea3626..0bc51649 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
index bff86825..f5c26dae 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
index f5e0e90e..9d1dc776 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
index 95d4cb8b..4f5daa0e 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeExec.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeExec.java
index 5b56c2fd..3a39d705 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeExec.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeExec.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeTest.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeTest.java
index 10e6123b..6f36ab77 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeTest.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullBeforeTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
index 3ab49138..cc491a88 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
index 9210806c..4bfe3695 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
index 761827f4..c67e55d0 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
index 1d7c39ac..9fe5f7c6 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
index 2559fc6b..99961c82 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
index ab99ff28..5c5a69ee 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
index 3f239884..a3f10f9f 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
index 7c4d9ccd..a4d659bf 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
index f4b90f00..2ecb5635 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
index a5d91be7..242ac253 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
index e5f3f46f..19c3c99f 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
index 317b4551..d6be3f07 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
index 4bd55a48..1c44064c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
index 6aab4e3c..bf1202ec 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java b/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
index d115daac..95cd3ce3 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
index bb1edf5d..1c9a34da 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
index 54011db0..7464c13f 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
index be0b942e..536c40da 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
index 57e81187..bd362198 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
index 9f6539c8..a1be87a7 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java b/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
index 343a128a..ee59e9b4 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
index a5107804..c7695cd7 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
index 843fd915..6f441c79 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
index 4d25e387..506e247e 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
index 44f932b3..1da0cb4b 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
index 4a9e728b..4faac0c2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
index c2d0bbd8..a7cce519 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
index 056c2885..a3c23d2c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
index caa41fe7..bf3b9eb3 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
index a84bafef..fa08cece 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiableInitializableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
index 33a8c3cc..f5e44925 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
index 9e015806..aeb9aef9 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractInitializableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/Component.java b/shib-support/src/main/java/net/shibboleth/shared/component/Component.java
index 34ea65b4..5fda635d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/Component.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/Component.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
index 3c44417f..fbe98d69 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentInitializationException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
index 5ce4f165..6b3e2208 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
index 78f55818..b2781d41 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/DestroyedComponentException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
index 733178b5..a00bdd8a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/DestructableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
index 3f2109c6..054c268d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
index 0473486c..8266d4b4 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/IdentifiedComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
index beccafb9..bc3cf894 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/InitializableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
index 70803db8..7f772ab8 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UninitializedComponentException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
index 7452665b..8f079eea 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponent.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
index d81bc69b..fd6ed7ab 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/UnmodifiableComponentException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
index 02fbf4ec..44365d87 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
index e5dbfbb9..7dcb053b 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
index 4ec42c90..a01c667d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
index 02f5bebe..51402feb 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
index ed87cced..25b38666 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
index d5836490..9b29269a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
index 20402250..932b6000 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java b/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
index da00351e..7b9411d5 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
index 4ed0964c..534a5903 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
index 8db4f9d8..1f948475 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/NonnullFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/NonnullFunction.java
index 544f3b41..a21e7cbc 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/NonnullFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/NonnullFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
index 6dad807e..e506b217 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
index 8156be3b..499fedec 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
index bdb9e796..e1941edc 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
index 30e25914..bca8d9f1 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
index 55e682f6..fb8e9a7e 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
index 0919cdc9..f013fca2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
index 60f7ca18..21721474 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
index 165f83ac..565dfae8 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
index abdb6ca9..73e50864 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
index 8d623c93..da8ee3b2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
index 3226f2ae..74ddba32 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
index 28190517..e570fee8 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
index 6a6545b9..26c567ea 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/CleanerSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/CleanerSupport.java
index dbe481fc..69086387 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/CleanerSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/CleanerSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/DeprecationSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/DeprecationSupport.java
index 55249c92..4824b0d3 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/DeprecationSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/DeprecationSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/LangBearingString.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/LangBearingString.java
index d6c9ce0d..f220913d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/LangBearingString.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/LangBearingString.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/LoggerFactory.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/LoggerFactory.java
index 1041e0ea..66fbdde8 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/LoggerFactory.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/LoggerFactory.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/NonnullSupplier.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/NonnullSupplier.java
index 604659d0..e38dd7e5 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/NonnullSupplier.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/NonnullSupplier.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/ObjectSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/ObjectSupport.java
index 248981df..a957123b 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/ObjectSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/ObjectSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
index 4c5acba0..e8a4ed75 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
index fd4cb0f5..4b8e095e 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/package-info.java
index dfe95635..1b7adafb 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
index eb7867f0..e8e2ba1f 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
index 3d885b99..88637a43 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriteriaSet.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
index 3603f752..b6a5b159 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/Criterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
index 0a83c13e..e040a2c0 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
index 0212b01b..3a84972c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/Resolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
index f064a1ff..9cde51e6 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
index 7df8296c..464a5959 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
index 9d81418d..fac5dda4 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java b/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
index 22d4aa27..ac131512 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resource/Resource.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
index 1c704439..fdc48e23 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resource/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
index 8ec7529c..7e377494 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
index 71dfdfb8..699d3de9 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
index f78f7e53..4072841c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
index a335b9f9..56dce3fa 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
index d860e1b4..9ab17318 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
index 0127acb2..50443380 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/ClasspathResolver.java b/shib-support/src/main/java/net/shibboleth/shared/xml/ClasspathResolver.java
index 15a57880..3ed210f2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/ClasspathResolver.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/ClasspathResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
index 5e4cc780..e31ef414 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
index 10be289d..bea16254 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
index 2e23ec14..9df48ba4 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/ParserPool.java b/shib-support/src/main/java/net/shibboleth/shared/xml/ParserPool.java
index d9e416e0..92ae761c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/ParserPool.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/ParserPool.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
index d7942b9f..a2a82d3c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
index 1672bf8e..c3df61f7 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
index 7a60c1e5..37227f52 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLConstants.java b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLConstants.java
index 243438e7..52ba20a2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLConstants.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLConstants.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLParserException.java b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLParserException.java
index 52ff4e12..7a853c6f 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLParserException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLParserException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLSpace.java b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLSpace.java
index 90983e41..4f9157e3 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/XMLSpace.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/XMLSpace.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
index 8149af2f..32c9bd2a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
index 2060488b..03b24e96 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/ThrowingEntityResolver.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/ThrowingEntityResolver.java
index bf105025..8e9bbf5d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/ThrowingEntityResolver.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/ThrowingEntityResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/package-info.java
index 196013a9..b41afec5 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/xml/package-info.java
index 9a069286..76d69bb0 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
index c6179490..ecc2a171 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
index 03949a18..712a38aa 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
index 76137435..a02b4817 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
index ad4802a2..dc2c9193 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
index b01bf193..703632a3 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
index b0a685bf..c30f263b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index 77a22ffe..e9734ce8 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
index af80f7af..bb7a800a 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
index 8535435b..f89a6a06 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
index 92eef586..a751ae43 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
index 10968660..c824b6fc 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
index f27b3bb4..b1369ef7 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
index 87ca7f95..56b23f32 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
index 79a5a896..fad8097c 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
index 70569a7f..68826f5e 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
index b7b812de..1e58a890 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
index 246e574a..ad984274 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
index b288182b..a94421e4 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
index ede393af..da07efac 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
index f358cfa5..f1710138 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
index 435fa5b2..26b8e685 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
index 3824e2e8..184894db 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
index b3987e56..37fc75ba 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
index d93d7a64..209dfa18 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
index 000b17cb..9f323865 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
index 73781290..6649f299 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
index 799f6f72..a165a44d 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
index 62f3b598..0de3b7fc 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractInitializableComponentTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
index 2ec82004..d7f92f90 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
index 46209bca..c86cd828 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
index 1660cd71..29d4494c 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
index c34053dd..4bd1701e 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
index 1d659852..e061779f 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
index 3e9d5d89..f7667f2d 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
index 50ce7fc6..2a2f21d8 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
index cd06dd0f..23e5a052 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
index 6fc90e4e..6e15bfb4 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
index 2e489cc0..ee4c5a53 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
index 9efb5740..7cebfc63 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/primitive/ObjectSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/primitive/ObjectSupportTest.java
index fcf33424..6a92a632 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/primitive/ObjectSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/primitive/ObjectSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
index a1400408..80414438 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/primitive/TimerSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/primitive/TimerSupportTest.java
index 731368ea..c14c05fa 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/primitive/TimerSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/primitive/TimerSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
index 251427b5..97a5e2b0 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriteriaSetTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
index 25d8d257..6d8dd40d 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/CriterionPredicateRegistryTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
index 9adb0204..ecfe7a7b 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableFooCriterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
index 88774849..8eaa1be6 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/EvaluableTestFooCriterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
index 3fc6319c..92da26c5 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/Foo.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
index bf6f4332..7c0815b0 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/FooPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
index 0d94ab3f..58c97f77 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/ResolverSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java b/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
index 09cb9b9f..1546fbe7 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/resolver/TestCriterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
index 66ab7910..89e3e65e 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
index aee47c10..430b7d01 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
index a3abe8e7..ba8b2a8b 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
index 45069da8..a516ac7f 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/DOMTypeSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/DOMTypeSupportTest.java
index 303b6bdf..391a02ce 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/DOMTypeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/DOMTypeSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
index 48b464bf..5beb8c96 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/NamespaceSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/NamespaceSupportTest.java
index 74b01332..17895fe3 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/NamespaceSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/NamespaceSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
index cba0f866..17c29d64 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
index 4ef6cc85..c91e279d 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/SchemaBuilderTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/SerializeSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/SerializeSupportTest.java
index e1a90aa1..b5f16746 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/SerializeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/SerializeSupportTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
index 00371465..b80387ea 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/XMLSpaceTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/XMLSpaceTest.java
index 6b7fbd76..800cd9f0 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/XMLSpaceTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/XMLSpaceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
index 7032f550..dc2e06d9 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/WellFormedTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/WellFormedTest.java
index 36a8f773..07aa7b83 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/WellFormedTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/WellFormedTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/ConstantSupplier.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/ConstantSupplier.java
index fd0b14be..f86227b2 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/ConstantSupplier.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/ConstantSupplier.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/DatabaseTestingSupport.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/DatabaseTestingSupport.java
index ab1a29bd..ec9645cd 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/DatabaseTestingSupport.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/DatabaseTestingSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/InMemoryDirectory.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/InMemoryDirectory.java
index 0d11213a..c0024499 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/InMemoryDirectory.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/InMemoryDirectory.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockApplicationContext.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockApplicationContext.java
index 4b0eca52..6de868a2 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockApplicationContext.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockApplicationContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
index 0d1c33cd..97644b54 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/MockReloadableService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
index 3ee00f2a..cc65a21b 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/ResourceTestHelper.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/ResourceTestHelper.java
index 601517e8..3ce6d10b 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/ResourceTestHelper.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/ResourceTestHelper.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/ShowAutomaticModuleNames.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/ShowAutomaticModuleNames.java
index 7394e2ab..3c318092 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/ShowAutomaticModuleNames.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/ShowAutomaticModuleNames.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/TestSupport.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/TestSupport.java
index 5717ea78..da9c9099 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/TestSupport.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/TestSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/VelocityEngine.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/VelocityEngine.java
index abdb2786..3c3ae19b 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/VelocityEngine.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/VelocityEngine.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/package-info.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/package-info.java
index a0dc0828..ae434a33 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/package-info.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
index 32007a2f..7bdfbe81 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfig.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfig.java
index 57a4e63e..44f47380 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfig.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfig.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
index 96544acd..1c577b0e 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactory.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactory.java
index d6177a51..be32cd30 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactory.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactory.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactoryBean.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactoryBean.java
index c015bd38..7f2149a4 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactoryBean.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityEngineFactoryBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityView.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityView.java
index 9ab2830c..e0cf5e19 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityView.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityView.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityViewResolver.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityViewResolver.java
index 8277e357..b14a2684 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityViewResolver.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityViewResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/package-info.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/package-info.java
index b538237f..4acc6085 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/package-info.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
index 5487931c..60bfad1c 100644
--- a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
+++ b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/package-info.java b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/package-info.java
index aaa79ea5..3d622ed2 100644
--- a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/package-info.java
+++ b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list