[java-shib-profile] branch main updated: GEN-269 - Replace code header
Scott Cantor
cantor.2 at osu.edu
Tue Aug 1 14:38:56 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-profile.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=3db0be1385d7841ba9e7c312ba10bde423c77397
The following commit(s) were added to refs/heads/main by this push:
new 3db0be1 GEN-269 - Replace code header
3db0be1 is described below
commit 3db0be1385d7841ba9e7c312ba10bde423c77397
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 10:38:52 2023 -0400
GEN-269 - Replace code header
https://shibboleth.atlassian.net/browse/GEN-269
---
.gitignore | 12 +-----------
resources/checkstyle/checkstyle.xml | 2 +-
.../config/AbstractConditionalProfileConfiguration.java | 9 +++------
.../profile/config/AbstractProfileConfiguration.java | 9 +++------
.../config/AttributeResolvingProfileConfiguration.java | 9 +++------
.../profile/config/ConditionalProfileConfiguration.java | 9 +++------
.../profile/config/OverriddenIssuerProfileConfiguration.java | 9 +++------
.../net/shibboleth/profile/config/ProfileConfiguration.java | 9 +++------
.../profile/config/logic/DetailedErrorsPredicate.java | 9 +++------
.../profile/config/logic/ResolveAttributesPredicate.java | 9 +++------
.../net/shibboleth/profile/config/logic/package-info.java | 9 +++------
.../AbstractDefaultSecurityConfigurationLookupFunction.java | 9 +++------
.../ClientTLSValidationConfigurationLookupFunction.java | 9 +++------
.../navigate/DecryptionConfigurationLookupFunction.java | 9 +++------
.../navigate/EncryptionConfigurationLookupFunction.java | 9 +++------
.../navigate/IdentifierGenerationStrategyLookupFunction.java | 9 +++------
.../SignatureSigningConfigurationLookupFunction.java | 9 +++------
.../SignatureValidationConfigurationLookupFunction.java | 9 +++------
.../AbstractDefaultSecurityConfigurationLookupFunction.java | 9 +++------
.../HttpClientSecurityConfigurationLookupFunction.java | 9 +++------
.../SignatureSigningConfigurationLookupFunction.java | 9 +++------
.../SignatureValidationConfigurationLookupFunction.java | 9 +++------
.../profile/config/navigate/messaging/package-info.java | 9 +++------
.../net/shibboleth/profile/config/navigate/package-info.java | 9 +++------
.../java/net/shibboleth/profile/config/package-info.java | 9 +++------
.../java/net/shibboleth/profile/context/AuditContext.java | 9 +++------
.../net/shibboleth/profile/context/RelyingPartyContext.java | 9 +++------
.../profile/context/logic/AbstractAttributePredicate.java | 9 +++------
.../profile/context/logic/AbstractRelyingPartyPredicate.java | 9 +++------
.../profile/context/logic/DateAttributePredicate.java | 9 +++------
.../profile/context/logic/DynamicAttributePredicate.java | 9 +++------
.../profile/context/logic/LoopDetectionPredicate.java | 9 +++------
.../profile/context/logic/RegexAttributePredicate.java | 9 +++------
.../profile/context/logic/RelyingPartyIdPredicate.java | 9 +++------
.../shibboleth/profile/context/logic/ScriptedPredicate.java | 9 +++------
.../profile/context/logic/SimpleAttributePredicate.java | 9 +++------
.../profile/context/logic/SpringExpressionPredicate.java | 9 +++------
.../profile/context/logic/VerifiedProfilePredicate.java | 9 +++------
.../logic/messaging/AbstractRelyingPartyPredicate.java | 9 +++------
.../profile/context/logic/messaging/package-info.java | 9 +++------
.../net/shibboleth/profile/context/logic/package-info.java | 9 +++------
.../context/navigate/AbstractRelyingPartyLookupFunction.java | 9 +++------
.../profile/context/navigate/IssuerLookupFunction.java | 9 +++------
.../context/navigate/RelyingPartyIdLookupFunction.java | 9 +++------
.../context/navigate/ScriptedContextLookupFunction.java | 9 +++------
.../navigate/ServletRequestProfileRequestContextLookup.java | 9 +++------
.../navigate/SpringExpressionContextLookupFunction.java | 9 +++------
.../messaging/AbstractRelyingPartyLookupFunction.java | 9 +++------
.../profile/context/navigate/messaging/package-info.java | 9 +++------
.../shibboleth/profile/context/navigate/package-info.java | 9 +++------
.../java/net/shibboleth/profile/context/package-info.java | 9 +++------
.../installablecomponent/InstallableComponentInfo.java | 9 +++------
.../installablecomponent/InstallableComponentSupport.java | 9 +++------
.../installablecomponent/InstallableComponentVersion.java | 9 +++------
.../profile/installablecomponent/package-info.java | 9 +++------
.../java/net/shibboleth/profile/module/AbstractModule.java | 9 +++------
.../src/main/java/net/shibboleth/profile/module/Module.java | 9 +++------
.../java/net/shibboleth/profile/module/ModuleContext.java | 9 +++------
.../java/net/shibboleth/profile/module/ModuleException.java | 9 +++------
.../net/shibboleth/profile/module/PropertyDrivenModule.java | 9 +++------
.../java/net/shibboleth/profile/module/package-info.java | 9 +++------
.../java/net/shibboleth/profile/plugin/AbstractPlugin.java | 9 +++------
.../src/main/java/net/shibboleth/profile/plugin/Plugin.java | 9 +++------
.../java/net/shibboleth/profile/plugin/PluginException.java | 9 +++------
.../net/shibboleth/profile/plugin/PropertyDrivenPlugin.java | 9 +++------
.../java/net/shibboleth/profile/plugin/package-info.java | 9 +++------
.../profile/relyingparty/BasicRelyingPartyConfiguration.java | 9 +++------
.../profile/relyingparty/RelyingPartyConfiguration.java | 9 +++------
.../relyingparty/RelyingPartyConfigurationResolver.java | 9 +++------
.../profile/relyingparty/RelyingPartyCredentialResolver.java | 9 +++------
.../profile/relyingparty/VerifiedProfileCriterion.java | 9 +++------
.../net/shibboleth/profile/relyingparty/package-info.java | 9 +++------
.../profile/context/logic/DateAttributePredicateTest.java | 9 +++------
.../profile/context/logic/DynamicAttributePredicateTest.java | 9 +++------
.../profile/context/logic/LoopDetectionPredicateTest.java | 9 +++------
.../profile/context/logic/RelyingPartyIdPredicateTest.java | 9 +++------
.../profile/context/logic/ScriptedPredicateTest.java | 9 +++------
.../profile/context/logic/SimpleAttributePredicateTest.java | 9 +++------
.../context/navigate/ScriptedContextLookupFunctionTest.java | 9 +++------
.../navigate/SpringExpressionContextLookupFunctionTest.java | 9 +++------
.../profile/audit/impl/AttributesAuditExtractor.java | 9 +++------
.../java/net/shibboleth/profile/audit/impl/package-info.java | 9 +++------
.../logic/impl/RelyingPartiesActivationConditionFactory.java | 9 +++------
.../shibboleth/profile/context/logic/impl/package-info.java | 9 +++------
.../relyingparty/impl/CriteriaSelfEntityIDResolver.java | 9 +++------
.../impl/DefaultRelyingPartyConfigurationResolver.java | 9 +++------
.../shibboleth/profile/relyingparty/impl/package-info.java | 9 +++------
.../shibboleth/profile/spring/impl/OpenSAMLConfigBean.java | 9 +++------
.../net/shibboleth/profile/spring/impl/package-info.java | 9 +++------
.../impl/DefaultRelyingPartyConfigurationResolverTest.java | 9 +++------
.../relyingparty/impl/RelyingPartyConfigurationTest.java | 9 +++------
.../profile/config/testing/MockProfileConfiguration.java | 9 +++------
.../net/shibboleth/profile/config/testing/package-info.java | 9 +++------
.../java/net/shibboleth/saml/binding/BindingDescriptor.java | 9 +++------
.../main/java/net/shibboleth/saml/binding/package-info.java | 9 +++------
.../saml/profile/config/BasicSAMLArtifactConfiguration.java | 9 +++------
.../config/SAMLArtifactAwareProfileConfiguration.java | 9 +++------
.../saml/profile/config/SAMLArtifactConfiguration.java | 9 +++------
.../config/SAMLArtifactConsumerProfileConfiguration.java | 9 +++------
.../config/SAMLAssertionConsumingProfileConfiguration.java | 9 +++------
.../config/SAMLAssertionProducingProfileConfiguration.java | 9 +++------
.../saml/profile/config/SAMLProfileConfiguration.java | 9 +++------
.../config/logic/NotBeforeProfileConfigPredicate.java | 9 +++------
.../saml/profile/config/logic/SignAssertionsPredicate.java | 9 +++------
.../saml/profile/config/logic/SignRequestsPredicate.java | 9 +++------
.../saml/profile/config/logic/SignResponsesPredicate.java | 9 +++------
.../logic/messaging/ClientTLSArtifactRequestsPredicate.java | 9 +++------
.../logic/messaging/SignArtifactRequestsPredicate.java | 9 +++------
.../saml/profile/config/logic/messaging/package-info.java | 9 +++------
.../shibboleth/saml/profile/config/logic/package-info.java | 9 +++------
.../config/navigate/AssertionAudiencesLookupFunction.java | 9 +++------
.../config/navigate/AssertionLifetimeLookupFunction.java | 9 +++------
.../config/navigate/AudienceRestrictionsLookupFunction.java | 9 +++------
.../navigate/messaging/MessageHandlerLookupFunction.java | 9 +++------
.../saml/profile/config/navigate/messaging/package-info.java | 9 +++------
.../saml/profile/config/navigate/package-info.java | 9 +++------
.../net/shibboleth/saml/profile/config/package-info.java | 9 +++------
.../context/logic/MappedEntityAttributesPredicate.java | 9 +++------
.../shibboleth/saml/profile/context/logic/package-info.java | 9 +++------
.../context/navigate/SAMLMetadataContextLookupFunction.java | 9 +++------
.../messaging/SAMLMetadataContextLookupFunction.java | 9 +++------
.../profile/context/navigate/messaging/package-info.java | 9 +++------
.../saml/profile/context/navigate/package-info.java | 9 +++------
.../saml/relyingparty/RelyingPartyConfigurationSupport.java | 9 +++------
.../java/net/shibboleth/saml/relyingparty/package-info.java | 9 +++------
.../config/ArtifactResolutionProfileConfiguration.java | 9 +++------
.../profile/config/AttributeQueryProfileConfiguration.java | 9 +++------
.../saml1/profile/config/BrowserSSOProfileConfiguration.java | 9 +++------
.../shibboleth/saml/saml1/profile/config/package-info.java | 9 +++------
.../config/ArtifactResolutionProfileConfiguration.java | 9 +++------
.../profile/config/AttributeQueryProfileConfiguration.java | 9 +++------
.../saml2/profile/config/BrowserSSOProfileConfiguration.java | 9 +++------
.../saml/saml2/profile/config/ECPProfileConfiguration.java | 9 +++------
.../config/SAML2AssertionProducingProfileConfiguration.java | 9 +++------
.../saml/saml2/profile/config/SAML2ProfileConfiguration.java | 9 +++------
.../profile/config/SingleLogoutProfileConfiguration.java | 9 +++------
.../saml2/profile/config/logic/CheckAddressPredicate.java | 9 +++------
.../config/logic/IgnoreRequestSignaturesPredicate.java | 9 +++------
.../messaging/ClientTLSSOAPLogoutRequestsPredicate.java | 9 +++------
.../logic/messaging/SignSOAPLogoutRequestsPredicate.java | 9 +++------
.../saml2/profile/config/logic/messaging/package-info.java | 9 +++------
.../saml/saml2/profile/config/logic/package-info.java | 9 +++------
.../config/navigate/MaximumTimeSinceAuthnLookupFunction.java | 9 +++------
.../profile/config/navigate/ProxyCountLookupFunction.java | 9 +++------
.../navigate/QualifiedNameIDFormatsLookupFunction.java | 9 +++------
.../saml/saml2/profile/config/navigate/package-info.java | 9 +++------
.../shibboleth/saml/saml2/profile/config/package-info.java | 9 +++------
.../profile/config/BasicSAMLArtifactConfigurationTest.java | 9 +++------
.../profile/context/logic/EntityAttributesPredicateTest.java | 9 +++------
149 files changed, 443 insertions(+), 894 deletions(-)
diff --git a/.gitignore b/.gitignore
index 216359b..922ca63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,4 @@
# A simulation of Subversion default ignores, generated by reposurgeon.
-*.o
-*.lo
-*.la
-*.al
-*.libs
-*.so
-*.so.[0-9]*
-*.a
-*.pyc
-*.pyo
-*.rej
*~
*.#*
.*.swp
@@ -17,6 +6,7 @@
# Simulated Subversion default ignores end here
target
test-output
+.vscode
.settings
.project
.classpath
diff --git a/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
index 68c57c0..f456c13 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-profile-api/src/main/java/net/shibboleth/profile/config/AbstractConditionalProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractConditionalProfileConfiguration.java
index 04b81a7..74807b0 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractConditionalProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractConditionalProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractProfileConfiguration.java
index bcd4aa3..1070167 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AbstractProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/AttributeResolvingProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AttributeResolvingProfileConfiguration.java
index 362c435..8f037dc 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/AttributeResolvingProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/AttributeResolvingProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/ConditionalProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/ConditionalProfileConfiguration.java
index 73f9d7b..0663419 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/ConditionalProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/ConditionalProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/OverriddenIssuerProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/OverriddenIssuerProfileConfiguration.java
index 4bdd9b1..815334f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/OverriddenIssuerProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/OverriddenIssuerProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/ProfileConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/ProfileConfiguration.java
index a32c111..a8ca8b8 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/ProfileConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/ProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/DetailedErrorsPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/DetailedErrorsPredicate.java
index b1cd8b3..1a582aa 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/DetailedErrorsPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/DetailedErrorsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/ResolveAttributesPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/ResolveAttributesPredicate.java
index 7604bb9..1d525bf 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/ResolveAttributesPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/ResolveAttributesPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/package-info.java
index 596d607..05129cc 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/logic/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/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-profile-api/src/main/java/net/shibboleth/profile/config/navigate/AbstractDefaultSecurityConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/AbstractDefaultSecurityConfigurationLookupFunction.java
index 5b9fe47..f0b502f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/AbstractDefaultSecurityConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/AbstractDefaultSecurityConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
index 91d06d3..077f113 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/DecryptionConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/DecryptionConfigurationLookupFunction.java
index aaf3361..3bc6594 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/DecryptionConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/DecryptionConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/EncryptionConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/EncryptionConfigurationLookupFunction.java
index 890f2e2..0d6e2f6 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/EncryptionConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/EncryptionConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
index a2d3e14..3ea9bcc 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
index e828e79..2007ed9 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
index 398197c..1437ab5 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/AbstractDefaultSecurityConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/AbstractDefaultSecurityConfigurationLookupFunction.java
index 6d4825f..2828d8a 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/AbstractDefaultSecurityConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/AbstractDefaultSecurityConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
index daeb6f1..bf78cf9 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
index 1e6f4c2..16eb6cc 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
index 0c7d457..ce5fbc5 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/package-info.java
index 058757e..4e55a10 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/messaging/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-profile-api/src/main/java/net/shibboleth/profile/config/navigate/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/package-info.java
index db98583..f88e9a8 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/config/navigate/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-profile-api/src/main/java/net/shibboleth/profile/config/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/config/package-info.java
index 4c6469b..1ab4d9b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/config/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/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-profile-api/src/main/java/net/shibboleth/profile/context/AuditContext.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/AuditContext.java
index c738712..7e41686 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/AuditContext.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/AuditContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/RelyingPartyContext.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/RelyingPartyContext.java
index 017462d..75db2ff 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/RelyingPartyContext.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/RelyingPartyContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractAttributePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractAttributePredicate.java
index 83f3a6d..567f2d3 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractAttributePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractAttributePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractRelyingPartyPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractRelyingPartyPredicate.java
index 537216d..8821c5f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractRelyingPartyPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/AbstractRelyingPartyPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DateAttributePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DateAttributePredicate.java
index 505c2db..b86691b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DateAttributePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DateAttributePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DynamicAttributePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DynamicAttributePredicate.java
index f14dc7d..4416cc0 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DynamicAttributePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/DynamicAttributePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/LoopDetectionPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/LoopDetectionPredicate.java
index b3217b9..179591b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/LoopDetectionPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/LoopDetectionPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RegexAttributePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RegexAttributePredicate.java
index 2ea1098..4ce158f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RegexAttributePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RegexAttributePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicate.java
index c1dcef9..04964a3 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/ScriptedPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/ScriptedPredicate.java
index 8c15267..6eff91e 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/ScriptedPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/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-profile-api/src/main/java/net/shibboleth/profile/context/logic/SimpleAttributePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SimpleAttributePredicate.java
index 59a3701..92d037d 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SimpleAttributePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SimpleAttributePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SpringExpressionPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SpringExpressionPredicate.java
index 3305a0d..3cb7db3 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/SpringExpressionPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/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-profile-api/src/main/java/net/shibboleth/profile/context/logic/VerifiedProfilePredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/VerifiedProfilePredicate.java
index 9121d5c..808a802 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/VerifiedProfilePredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/VerifiedProfilePredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/AbstractRelyingPartyPredicate.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/AbstractRelyingPartyPredicate.java
index 23892c8..1fc6799 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/AbstractRelyingPartyPredicate.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/AbstractRelyingPartyPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/package-info.java
index 2fcd6a7..ec9d69d 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/messaging/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-profile-api/src/main/java/net/shibboleth/profile/context/logic/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/package-info.java
index abb95d9..7cb045a 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/logic/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/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-profile-api/src/main/java/net/shibboleth/profile/context/navigate/AbstractRelyingPartyLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/AbstractRelyingPartyLookupFunction.java
index e2c64e5..e4da7af 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/AbstractRelyingPartyLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/AbstractRelyingPartyLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/IssuerLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/IssuerLookupFunction.java
index 8114ab4..07f27d7 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/IssuerLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/IssuerLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/RelyingPartyIdLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/RelyingPartyIdLookupFunction.java
index 078da5f..50c1ff4 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/RelyingPartyIdLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/RelyingPartyIdLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
index 38e3c4a..e28e3bc 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ServletRequestProfileRequestContextLookup.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ServletRequestProfileRequestContextLookup.java
index b6faa8b..1b88afb 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ServletRequestProfileRequestContextLookup.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ServletRequestProfileRequestContextLookup.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunction.java
index 6e9f71d..78981a8 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/AbstractRelyingPartyLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/AbstractRelyingPartyLookupFunction.java
index aa442ad..8c10a9b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/AbstractRelyingPartyLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/AbstractRelyingPartyLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/package-info.java
index ad3a370..62d65ff 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/messaging/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-profile-api/src/main/java/net/shibboleth/profile/context/navigate/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/package-info.java
index 2cb7625..8f5462b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/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-profile-api/src/main/java/net/shibboleth/profile/context/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/package-info.java
index 6ec4f61..6eb67f9 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/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-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentInfo.java b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentInfo.java
index 4f1aecc..546a717 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentInfo.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentInfo.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
index e1bd50f..a2cdf8b 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentVersion.java b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentVersion.java
index 67ef39f..8a58f05 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentVersion.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentVersion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/package-info.java
index a0242b5..82c489d 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/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-profile-api/src/main/java/net/shibboleth/profile/module/AbstractModule.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/AbstractModule.java
index 925e767..f1260ac 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/AbstractModule.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/AbstractModule.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/module/Module.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/Module.java
index ffcd087..7e05301 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/Module.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/Module.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleContext.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleContext.java
index ef64d84..71c972f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleContext.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleContext.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleException.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleException.java
index 3698a5a..bab5c7f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleException.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/ModuleException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/module/PropertyDrivenModule.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/PropertyDrivenModule.java
index 1fb8dac..20c4506 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/PropertyDrivenModule.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/PropertyDrivenModule.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/module/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/module/package-info.java
index 6d55837..1eab210 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/module/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/module/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-profile-api/src/main/java/net/shibboleth/profile/plugin/AbstractPlugin.java b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/AbstractPlugin.java
index 48df62f..ee6ba09 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/AbstractPlugin.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/AbstractPlugin.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/Plugin.java b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/Plugin.java
index e9a9e0a..543ef65 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/Plugin.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/Plugin.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PluginException.java b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PluginException.java
index b82d945..e40e284 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PluginException.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PluginException.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PropertyDrivenPlugin.java b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PropertyDrivenPlugin.java
index 6edd01a..59b8ecf 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PropertyDrivenPlugin.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/PropertyDrivenPlugin.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/package-info.java
index 89aec5a..3f0a7b4 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/plugin/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-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
index 2d009f5..bcb44f7 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
index a778448..365fa06 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfigurationResolver.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfigurationResolver.java
index 06b74d5..bff3240 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfigurationResolver.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfigurationResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyCredentialResolver.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyCredentialResolver.java
index facbe37..952f526 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyCredentialResolver.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyCredentialResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
index fd8e826..41977f2 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/package-info.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/package-info.java
index b8b50f7..d233aff 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/package-info.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/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-profile-api/src/test/java/net/shibboleth/profile/context/logic/DateAttributePredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DateAttributePredicateTest.java
index fcf7d0d..2394405 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DateAttributePredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DateAttributePredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DynamicAttributePredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DynamicAttributePredicateTest.java
index 5aa8b54..2b63a66 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DynamicAttributePredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/DynamicAttributePredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
index 3ca8294..4903d7e 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
index 15ba6bf..0ede187 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
index 1f811c2..db2c335 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/SimpleAttributePredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/SimpleAttributePredicateTest.java
index 4e06a43..6f4963e 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/SimpleAttributePredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/SimpleAttributePredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunctionTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunctionTest.java
index b5e26d3..2b63f20 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunctionTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunctionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
index d84084a..7a48800 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/navigate/SpringExpressionContextLookupFunctionTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/AttributesAuditExtractor.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/AttributesAuditExtractor.java
index 9e2e308..9ba6b8f 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/AttributesAuditExtractor.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/AttributesAuditExtractor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/package-info.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/package-info.java
index f29c22a..9ffd438 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/impl/package-info.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/audit/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-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/RelyingPartiesActivationConditionFactory.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/RelyingPartiesActivationConditionFactory.java
index 6393757..0abcb7f 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/RelyingPartiesActivationConditionFactory.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/RelyingPartiesActivationConditionFactory.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/package-info.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/package-info.java
index 4439907..dce3148 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/impl/package-info.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/context/logic/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-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
index 301bbef..1a5db71 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index ba11f27..06494c9 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/package-info.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/package-info.java
index cd5a5ca..7cf15a5 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/package-info.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/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-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/OpenSAMLConfigBean.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/OpenSAMLConfigBean.java
index cdef90f..92a587d 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/OpenSAMLConfigBean.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/OpenSAMLConfigBean.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/package-info.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/package-info.java
index fb3934e..1c1dac7 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/impl/package-info.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/spring/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-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
index bc885a8..3788c47 100644
--- a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
+++ b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
index d88267f..651e0bd 100644
--- a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
+++ b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/MockProfileConfiguration.java b/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/MockProfileConfiguration.java
index ff220f9..e911019 100644
--- a/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/MockProfileConfiguration.java
+++ b/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/MockProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/package-info.java b/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/package-info.java
index b54ca69..0cadca1 100644
--- a/shib-profile-testing/src/main/java/net/shibboleth/profile/config/testing/package-info.java
+++ b/shib-profile-testing/src/main/java/net/shibboleth/profile/config/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-saml-profile-api/src/main/java/net/shibboleth/saml/binding/BindingDescriptor.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/BindingDescriptor.java
index 3d4eff2..a500534 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/BindingDescriptor.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/BindingDescriptor.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/package-info.java
index 744ec6d..1c7b45a 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/binding/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfiguration.java
index 03309c0..8b0cfa2 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java
index 411918b..3102bef 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactAwareProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConfiguration.java
index cf5fcb9..1d40031 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
index aed38fc..d735fa5 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionConsumingProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionConsumingProfileConfiguration.java
index 606e1d1..6679913 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionConsumingProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionConsumingProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionProducingProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionProducingProfileConfiguration.java
index ebe4c98..dbb49d0 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionProducingProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLAssertionProducingProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLProfileConfiguration.java
index afb5882..1372f9e 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/SAMLProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/NotBeforeProfileConfigPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/NotBeforeProfileConfigPredicate.java
index d7aedba..7978525 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/NotBeforeProfileConfigPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/NotBeforeProfileConfigPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignAssertionsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignAssertionsPredicate.java
index 5136f23..3462de6 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignAssertionsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignAssertionsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignRequestsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignRequestsPredicate.java
index 76e00c8..cefba54 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignRequestsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignRequestsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignResponsesPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignResponsesPredicate.java
index f214fa9..f06c288 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignResponsesPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/SignResponsesPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
index 7e4c0bf..a929f67 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
index 108aad7..9063ecc 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/package-info.java
index 7b267c9..8b79311 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/messaging/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/package-info.java
index 0311372..13e36ca 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/logic/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionAudiencesLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionAudiencesLookupFunction.java
index c14d149..2e03bc1 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionAudiencesLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionAudiencesLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionLifetimeLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionLifetimeLookupFunction.java
index e687e7f..34917e8 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionLifetimeLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AssertionLifetimeLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
index 64b14ab..d5597b4 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/MessageHandlerLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/MessageHandlerLookupFunction.java
index e356958..a2f8d23 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/MessageHandlerLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/MessageHandlerLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/package-info.java
index f5e7f04..49ffbf6 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/messaging/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/package-info.java
index 6a95d30..84095a4 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/navigate/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/package-info.java
index cabfa85..569bf23 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/config/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/MappedEntityAttributesPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/MappedEntityAttributesPredicate.java
index 2523e7f..ff9e455 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/MappedEntityAttributesPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/MappedEntityAttributesPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/package-info.java
index 0992610..06b7a23 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/logic/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/SAMLMetadataContextLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/SAMLMetadataContextLookupFunction.java
index 29a0607..e33a177 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/SAMLMetadataContextLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/SAMLMetadataContextLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/SAMLMetadataContextLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/SAMLMetadataContextLookupFunction.java
index 9f0f6ef..519f6bc 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/SAMLMetadataContextLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/SAMLMetadataContextLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/package-info.java
index 8e248d4..1de6dcf 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/messaging/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-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/package-info.java
index 4e5cd4a..5d79976 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/profile/context/navigate/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-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
index 253a246..6ad2785 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/package-info.java
index ec99a3f..b298c68 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/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-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
index 516a6f5..95a713a 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java
index 33aa495..b89b746 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
index 76d0e03..d47f6ec 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/package-info.java
index 3895820..27e5198 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/config/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml1/profile/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-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
index 2cf58d9..2168e63 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
index 55dd56d..d4caee6 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
index d35fffc..a9a27a2 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ECPProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ECPProfileConfiguration.java
index e569b06..a4aeba3 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ECPProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/ECPProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2AssertionProducingProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2AssertionProducingProfileConfiguration.java
index 1e1a7df..056f2a4 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2AssertionProducingProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2AssertionProducingProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2ProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2ProfileConfiguration.java
index 56c2ef1..0810c81 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2ProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SAML2ProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
index 259cc33..d0d3c54 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/CheckAddressPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/CheckAddressPredicate.java
index 49867c7..b94a1c4 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/CheckAddressPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/CheckAddressPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/IgnoreRequestSignaturesPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/IgnoreRequestSignaturesPredicate.java
index 4a6c67e..a16131e 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/IgnoreRequestSignaturesPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/IgnoreRequestSignaturesPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
index 18db057..6d50c0e 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
index 5b1814a..01c6d38 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/package-info.java
index 9b87b53..8e120dd 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/messaging/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-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/package-info.java
index 3bde8b9..a80d0b5 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/logic/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/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-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/MaximumTimeSinceAuthnLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/MaximumTimeSinceAuthnLookupFunction.java
index 34f110d..dd13f33 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/MaximumTimeSinceAuthnLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/MaximumTimeSinceAuthnLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
index ddbfd76..267108b 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/QualifiedNameIDFormatsLookupFunction.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/QualifiedNameIDFormatsLookupFunction.java
index 04aa4c4..48c751b 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/QualifiedNameIDFormatsLookupFunction.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/QualifiedNameIDFormatsLookupFunction.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/package-info.java
index 737b0df..7dc7f55 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/navigate/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-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/package-info.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/package-info.java
index 17ee2a3..efc9098 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/config/package-info.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/saml2/profile/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-saml-profile-api/src/test/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfigurationTest.java b/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfigurationTest.java
index d220171..3f05dee 100644
--- a/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfigurationTest.java
+++ b/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/config/BasicSAMLArtifactConfigurationTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/context/logic/EntityAttributesPredicateTest.java b/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/context/logic/EntityAttributesPredicateTest.java
index f44019b..c1c6658 100644
--- a/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/context/logic/EntityAttributesPredicateTest.java
+++ b/shib-saml-profile-api/src/test/java/net/shibboleth/saml/profile/context/logic/EntityAttributesPredicateTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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